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

This commit is contained in:
wanlop run 2025-05-15 14:39:40 +07:00
commit 823cca0f73
27 changed files with 521 additions and 334 deletions

View file

@ -35,19 +35,10 @@ Else
Var InstanceTabOpenFile6 = "ROOT/taobin_project/inter/hkg/xml/multi/page_catalog_group_health.lxml"
EndIf
Var InstanceTabOpenFile8 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml"
Var InstanceTabOpenFile9 = "ROOT/taobin_project/inter/hkg/xml/multi/start_up_inst_dummy.lxml"
Var InstanceTabOpenFile10 = "ROOT/taobin_project/inter/hkg/xml/multi/tab_menu.lxml"
Var InstanceTabOpenFile11 = "ROOT/taobin_project/inter/hkg/xml/multi/start_up_inst_dummy.lxml"
Var InstanceTabOpenFile12 = "ROOT/taobin_project/inter/hkg/xml/multi/start_up_inst_dummy.lxml"
Var InstanceTabOpenFile13 = "ROOT/taobin_project/inter/hkg/xml/multi/start_up_inst_dummy.lxml"
Var InstanceTabOpenFile15 = "ROOT/taobin_project/inter/hkg/xml/multi/tab_menu.lxml"
TabMenuVisibleInst 99
TabMenuLock 13
DEBUGVAR Not#CountDownForMulti
DEBUGVAR InstanceTabOpenFile2

View file

@ -162,7 +162,7 @@
SAVELOG " Back multi inst"
TabMenuVisibleInst 99
RootLayoutVisible 13 "hide"
;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_hide.lxml"
Var OpenFromMulti = 1
OpenInst 2 "ROOT/taobin_project/inter/hkg/xml/multi/page_catalog.lxml"

View file

@ -561,7 +561,7 @@
Var OpenFromMulti = 1
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/event/script_common_for_open_promotion_xml.ev"
RootLayoutVisible 3 "hide"
RootLayoutVisible 13 "hide"
;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_hide.lxml"
</EventClick>
<Language>

View file

@ -1,236 +1,236 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_default_init.lxml"
Var Menu1Selected = "PressForever"
Var OreoBigButtonEnable = "Enable"
If $12-01-01-0001.Button = "Invisible" Then
Var esp102101001Enable = "Invisible"
Var esp122101001Enable = "Enable"
Else
Var esp102101001Enable = "Enable"
Var esp122101001Enable = "Invisible"
EndIf
SAVELOG PreviseXMLFileName2
;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_show_and_refresh.lxml"
Var Timeout = 0
If show_eng = "true" Then
Var text_unavailable = "UNAVAILABLE###size=16"
Else
Var text_unavailable = "หมด###size=32"
EndIf
;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new_menu.lxml"
RootLayoutVisible 13 "show"
RootLayoutVisible 3 "show"
SetInstanceIgnoreTouch
</EventOpen>
<EventLanguageOnChange>
DEBUGVAR LanguageShow
If LanguageShow = "ENG" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
EndIf
If LanguageShow = "THAI" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
EndIf
If LanguageShow = "MYANMAR" Then
Var show_eng = "true"
DEBUGVAR show_eng
Var DirImage2 = "ROOT/taobin_project/image/drink_option_mmr/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_mmr/"
EndIf
If LanguageShow = "MTC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_mtc/"
Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_mtc/"
Var ice_tab_text = "冰塊及時準備好了。 "
EndIf
If LanguageShow = "MSC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_msc/"
Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_msc/"
Var ice_tab_text = "冰块及时准备好了。 "
EndIf
;inter-image
If CountryName = "Malaysia" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
;inter-image
If CountryName = "australia" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
;SAVELOG "EventLanguageOnChange menu -list"
Var LanguageButtonEnable = "Invisible"
Var BtnLangToggleIndex = "Enable"
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
RefreshAll
</EventLanguageOnChange>
<Timeout> 1000 </Timeout>
<EventTimeout>
;DEBUGVAR ICE_PROCESS_STATUS
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf
GetVisible inst_show
;DEBUGVAR inst_show
InstanceGetString SaveStringInst
;DEBUGVAR SaveStringInst
If inst_show = 1 Then
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
If LanguageShow = "ENG" Then
InstanceSetString "ShowEng"
EndIf
If LanguageShow = "MTC" Then
InstanceSetString "ShowMTC"
EndIf
If LanguageShow = "MSC" Then
InstanceSetString "ShowMSC"
EndIf
EndIf
EndIf
; setvarint SlientRefreshEnable 1
;DEBUGVAR SlientRefreshEnable
If SlientRefreshEnable = 1 Then
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
If LanguageShow = "ENG" Then
InstanceSetString "ShowEng"
EndIf
If LanguageShow = "MTC" Then
InstanceSetString "ShowMTC"
EndIf
If LanguageShow = "MSC" Then
InstanceSetString "ShowMSC"
EndIf
EndIf
EndIf
Var Timeout = Timeout + 1
;include="ROOT/taobin_project/inter/hkg/xml/multi/EventTimeOutWihtOutMultiInstance.ev"
TimerReset
</EventTimeout>
;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new.lxml"
<EventLanguageOnChange>
DEBUGVAR LanguageShow
If LanguageShow = "ENG" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
EndIf
If LanguageShow = "THAI" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
EndIf
If LanguageShow = "MYANMAR" Then
Var show_eng = "true"
DEBUGVAR show_eng
Var DirImage2 = "ROOT/taobin_project/image/drink_option_mmr/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_mmr/"
EndIf
If LanguageShow = "MTC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_mtc/"
Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_mtc/"
Var ice_tab_text = "冰塊及時準備好了。 "
EndIf
If LanguageShow = "MSC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_msc/"
Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_msc/"
Var ice_tab_text = "冰块及时准备好了。 "
EndIf
;inter-image
If CountryName = "Malaysia" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
;inter-image
If CountryName = "australia" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
;SAVELOG "EventLanguageOnChange menu -list"
Var LanguageButtonEnable = "Invisible"
Var BtnLangToggleIndex = "Enable"
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
</EventLanguageOnChange>
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_default_init.lxml"
Var Menu1Selected = "PressForever"
Var OreoBigButtonEnable = "Enable"
If $12-01-01-0001.Button = "Invisible" Then
Var esp102101001Enable = "Invisible"
Var esp122101001Enable = "Enable"
Else
Var esp102101001Enable = "Enable"
Var esp122101001Enable = "Invisible"
EndIf
SAVELOG PreviseXMLFileName2
;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_show_and_refresh.lxml"
Var Timeout = 0
If show_eng = "true" Then
Var text_unavailable = "UNAVAILABLE###size=16"
Else
Var text_unavailable = "หมด###size=32"
EndIf
;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new_menu.lxml"
RootLayoutVisible 15 "show"
RootLayoutVisible 3 "show"
SetInstanceIgnoreTouch
</EventOpen>
<EventLanguageOnChange>
DEBUGVAR LanguageShow
If LanguageShow = "ENG" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
EndIf
If LanguageShow = "THAI" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
EndIf
If LanguageShow = "MYANMAR" Then
Var show_eng = "true"
DEBUGVAR show_eng
Var DirImage2 = "ROOT/taobin_project/image/drink_option_mmr/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_mmr/"
EndIf
If LanguageShow = "MTC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_mtc/"
Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_mtc/"
Var ice_tab_text = "冰塊及時準備好了。 "
EndIf
If LanguageShow = "MSC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_msc/"
Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_msc/"
Var ice_tab_text = "冰块及时准备好了。 "
EndIf
;inter-image
If CountryName = "Malaysia" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
;inter-image
If CountryName = "australia" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
;SAVELOG "EventLanguageOnChange menu -list"
Var LanguageButtonEnable = "Invisible"
Var BtnLangToggleIndex = "Enable"
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
RefreshAll
</EventLanguageOnChange>
<Timeout> 1000 </Timeout>
<EventTimeout>
;DEBUGVAR ICE_PROCESS_STATUS
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf
GetVisible inst_show
;DEBUGVAR inst_show
InstanceGetString SaveStringInst
;DEBUGVAR SaveStringInst
If inst_show = 1 Then
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
If LanguageShow = "ENG" Then
InstanceSetString "ShowEng"
EndIf
If LanguageShow = "MTC" Then
InstanceSetString "ShowMTC"
EndIf
If LanguageShow = "MSC" Then
InstanceSetString "ShowMSC"
EndIf
EndIf
EndIf
; setvarint SlientRefreshEnable 1
;DEBUGVAR SlientRefreshEnable
If SlientRefreshEnable = 1 Then
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
If LanguageShow = "ENG" Then
InstanceSetString "ShowEng"
EndIf
If LanguageShow = "MTC" Then
InstanceSetString "ShowMTC"
EndIf
If LanguageShow = "MSC" Then
InstanceSetString "ShowMSC"
EndIf
EndIf
EndIf
Var Timeout = Timeout + 1
;include="ROOT/taobin_project/inter/hkg/xml/multi/EventTimeOutWihtOutMultiInstance.ev"
TimerReset
</EventTimeout>
;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new.lxml"
<EventLanguageOnChange>
DEBUGVAR LanguageShow
If LanguageShow = "ENG" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
EndIf
If LanguageShow = "THAI" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
EndIf
If LanguageShow = "MYANMAR" Then
Var show_eng = "true"
DEBUGVAR show_eng
Var DirImage2 = "ROOT/taobin_project/image/drink_option_mmr/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_mmr/"
EndIf
If LanguageShow = "MTC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_mtc/"
Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_mtc/"
Var ice_tab_text = "冰塊及時準備好了。 "
EndIf
If LanguageShow = "MSC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_msc/"
Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_msc/"
Var ice_tab_text = "冰块及时准备好了。 "
EndIf
;inter-image
If CountryName = "Malaysia" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
;inter-image
If CountryName = "australia" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
;SAVELOG "EventLanguageOnChange menu -list"
Var LanguageButtonEnable = "Invisible"
Var BtnLangToggleIndex = "Enable"
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
</EventLanguageOnChange>
<FrameScroll>
<Max> 16 </Max>
<X> 10 </X>
@ -12948,29 +12948,29 @@
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick>
</Button>
<Button>
<X> 780 </X>
<Y> 500 </Y>
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
Var buttonRemoveCup = "Invisible"
</EventClick>
</Button>
;BigLogoLayout
</Popup>
<Button>
<X> 780 </X>
<Y> 500 </Y>
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
Var buttonRemoveCup = "Invisible"
</EventClick>
</Button>
;BigLogoLayout
</Popup>

View file

@ -41,7 +41,7 @@
EndIf
;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new_menu.lxml"
RootLayoutVisible 13 "show"
RootLayoutVisible 15 "show"
RootLayoutVisible 3 "show"

View file

@ -7,7 +7,7 @@
RootLayoutVisible 3 "show"
RootLayoutVisible 13 "show"
RootLayoutVisible 15 "show"
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"

View file

@ -3,7 +3,6 @@
<Height> 1920 </Height>
<EventOpen>
Var InstanceTabOpenFile11 = "ROOT/taobin_project/inter/hkg/xml/multi/start_up_inst_dummy.xml"
</EventOpen>
<Timeout> 10000 </Timeout>

View file

@ -3,7 +3,6 @@
<Height> 1920 </Height>
<EventOpen>
Var InstanceTabOpenFile12 = "ROOT/taobin_project/inter/hkg/xml/multi/start_up_inst_dummy.xml"
</EventOpen>
<Timeout> 10000 </Timeout>

View file

@ -3,7 +3,6 @@
<Height> 1920 </Height>
<EventOpen>
Var InstanceTabOpenFile13 = "ROOT/taobin_project/inter/hkg/xml/multi/start_up_inst_dummy.xml"
</EventOpen>
<Timeout> 10000 </Timeout>

View file

@ -0,0 +1,23 @@
<Popup>
<Width> 1080</Width>
<Height> 1920 </Height>
<EventOpen>
</EventOpen>
<Timeout> 10000 </Timeout>
<EventTimeout>
If InstanceTabOpenFile14 = "" Then
Else
Open InstanceTabOpenFile14
EndIf
TimerReset
</EventTimeout>
</Popup>

View file

@ -82,7 +82,7 @@
;TRY OpenFileXML
RootLayoutVisible 3 "hide"
RootLayoutVisible 13 "hide"
RootLayoutVisible 15 "hide"
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/event/script_common_for_open_promotion_xml.ev"
</EventClick>
@ -252,7 +252,7 @@
RootLayoutVisible 3 "hide"
RootLayoutVisible 13 "hide"
RootLayoutVisible 15 "hide"
TabMenuVisibleInst 99
OpenInst 2 "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml"

View file

@ -1 +1 @@
RootLayoutVisible 13 "hide"
RootLayoutVisible 15 "hide"

View file

@ -1,2 +1,3 @@
OpenInst 13 "ROOT/taobin_project/inter/hkg/xml/multi/tab_menu.lxml"
OpenInst 15 "ROOT/taobin_project/inter/hkg/xml/multi/tab_menu.lxml"
RootLayoutVisible 15 "show"

View file

@ -7,7 +7,7 @@
<EventOpen>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
RootLayoutVisible 13 "hide"
;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_hide.lxml"
Var UserSeletedSugar = 0