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

renovate remove cup and cup on arm

Browse source
This commit is contained in:
wanlop run 2025-06-04 22:08:49 +07:00
parent 34ceea967c
commit f6a7ec1501
57 changed files with 591 additions and 475 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
SAVELOG "Call coffee.ev"
RootLayoutVisible 10 "show"
TabMenuVisibleInst 2
TabMenuVisibleInst 2
Var RedirectTo = "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"

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

@ -99,6 +99,9 @@ Var InstanceTabOpenFile9 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVe
Var InstanceTabOpenFile9 = InstanceTabOpenFile9 + "/page_catalog_group_frozen_fruit.lxml"
OpenRedirect "taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/recommend.ev"
OpenRedirect "taobin_project/inter/tha/xml/page_catalog_group_recommend.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/recommend.ev"
Var InstanceTabOpenFile11 = "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"

24
inter/tha/xml/multi/menu_catalog_new.lxml
View file

@ -16,8 +16,7 @@
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
Refresh
EndIf
@ -36,13 +35,13 @@
Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
EndIf
If LanguageShow = "MYANMAR" Then
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 = "MSC" Then
If LanguageShow = "MSC" Then
Var show_eng = "true"
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_msc/"
Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_msc/"
@ -53,21 +52,21 @@
SAVELOG "EventLanguageOnChange menu -list"
Var LanguageButtonEnable = "Enable"
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_open_instance.lxml"
RefreshAll
Script "-" "-"
Script "-" "-"
Var Timeout = 0
</EventLanguageOnChange>
@ -98,14 +97,14 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
SAVELOG " Back multi inst"
TabMenuVisibleInst 99
RootLayoutVisible 13 "hide"
Var OpenFromMulti = 1
OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml"
OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml"
</EventClick>
</Button>
@ -140,4 +139,3 @@
EndIf
</EventWebApp>

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

@ -1,3 +1,3 @@
SAVELOG "Call milk.ev"
TabMenuVisibleInst 4
TabMenuVisibleInst 4
Var RedirectTo = "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"

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

@ -310,25 +310,7 @@
EndIf
If Seeker = "Next" Then
Var buttonRemoveCup = "Invisible"
Else
; zone cup on arm
If CupOnArm = "true" Then
If CheckCupStateDoorCupClose = "" Then
Var buttonRemoveCup = "Enable"
EndIf
If CheckCupStateDoorCupClose = "done" Then
Var buttonRemoveCup = "Enable"
EndIf
Else
If buttonRemoveCup = "Enable" Then
Var buttonRemoveCup = "Invisible"
EndIf
EndIf
EndIf
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
@ -1246,13 +1228,19 @@
<EventUnitTest5>
<Name> "Test Redirect page_catalog_group_recommend.lxml" </Name>
<Script>
Open "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml"
</Script>
Open "ROOT/taobin_project/xml/page_check_member2_campaign.xml"
</EventUnitTest5>
<EventUnitTest6>
<Name> "Test Redirect page_catalog_group_other_other.lxml" </Name>
<Script>
Open "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other_other.lxml"
</Script>
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
</EventUnitTest6>
<EventUnitTest7>
@ -1267,4 +1255,5 @@
Open "ROOT/taobin_project/xml/page_payment_credit3-TopupSuccess.xml"
</EventUnitTest8>
</Popup>

3
inter/tha/xml/multi/recommend.ev Normal file
View file

@ -0,0 +1,3 @@
SAVELOG "Call recommend"
TabMenuVisibleInst 10
Var RedirectTo = "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"

42
inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml
View file

@ -52,10 +52,16 @@
Var inst_show_exclude_group_counter = 45
EndIf
EndIf
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
EndIf
Var RecommendTimeOut = RecommendTimeOut + 1
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
TimerReset
</EventTimeout>
@ -139,40 +145,6 @@ OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_ap
OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_happy_trios.lxml"
</EventOnClick>
</Banner>
<Banner>
<State> SchoolOvaltineProState </State>
<Type> VIDEO </Type>
<Media>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.mp4"
Else
Var return = "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.mp4"
EndIf
)
</Media>
<EventOnClick>
TabMenuVisibleInst 99
OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_school_ovaltine.lxml"
</EventOnClick>
</Banner>
<Banner>
<State> OreoVolcanoProState </State>
<Type> IMAGE </Type>
<Media>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png"
Else
Var return = "ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png"
EndIf
)
</Media>
<EventOnClick>
TabMenuVisibleInst 99
OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_oreo_volcano.lxml"
</EventOnClick>
</Banner>
; ==================> Len = 3
; - - 12-03-03-0032
@ -15192,4 +15164,6 @@ OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_or
;include="ROOT/taobin_project/inc/button_remove_cup.inc"
</Popup>

19
inter/tha/xml/multi/v3/event/event_v3/catalog_other/active_promotions.lxml
View file

@ -7,7 +7,7 @@
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
DEBUGVAR SlientRefreshIndex
If SlientRefreshIndex = 7 Then
@ -19,7 +19,7 @@
</EventOpen>
<EventOnShow>
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
; soda and other
Var Menu62Selected = "PressForever"
@ -35,8 +35,9 @@
Var OtherOtherRefreshTimeOut = 14
DEBUGVAR SlientRefreshIndex
Var buttonRemoveCupOnArm = "Invisible"
RefreshAll
</EventOnShow>
@ -46,7 +47,7 @@
;DEBUGVAR ICE_PROCESS_STATUS
;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"
; setvarint RefreshOtherOther 1
@ -54,18 +55,18 @@
Var RefreshOtherOther = 0
SAVELOG "OPEN FROM 8"
Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml"
EndIf
EndIf
GetVisible inst_show_other_other
;DEBUGVAR inst_show_other_other
Var OtherOtherRefreshTimeOut = OtherOtherRefreshTimeOut + 1
;DEBUGVAR OtherOtherRefreshTimeOut
If OtherOtherRefreshTimeOut > 15 Then
Var OtherOtherRefreshTimeOut = 0
Script "-" "-"
If inst_show_other_other = 1 Then

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

@ -8,12 +8,14 @@ Var ButtonLanguageListYPosition = 450 - 38
Var LanguageButtonEnable = "Enable"
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 15 "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
TabMenuVisibleInst 10
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
Var Menu1Selected = "PressForever"
OpenInst 15 "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
RootLayoutVisible 15 "show"
;Var FileRecommendToOpen = "ROOT/taobin_project/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml"
@ -43,4 +45,4 @@ EndIf
If HappyTriosPro = 1 Then
Var HappyTriosProState = "Enable"
EndIf
EndIf

2
inter/tha/xml/multi/v3/page_catalog_group_20_baht.lxml
View file

@ -30,6 +30,8 @@
DEBUGVAR SlientRefreshIndex
Var buttonRemoveCupOnArm = "Invisible"
RefreshAll
</EventOnShow>

2
inter/tha/xml/multi/v3/page_catalog_group_20_baht.skt
View file

@ -32,6 +32,8 @@
DEBUGVAR SlientRefreshIndex
Var buttonRemoveCupOnArm = "Invisible"
RefreshAll
</EventOnShow>

16
inter/tha/xml/multi/v3/page_catalog_group_coffee.lxml
View file

@ -39,9 +39,11 @@
Var inst_show_coffee_counter = 4
DEBUGVAR SlientRefreshIndex
Var buttonRemoveCupOnArm = "Invisible"
RefreshAll
</EventOnShow>
<Timeout> 1000 </Timeout>
@ -57,15 +59,15 @@
Else
Var ice_tab_process_show = "Invisible"
EndIf
GetVisible inst_show_coffee
If inst_show_coffee = 1 Then
If inst_show_coffee_counter > 0 Then
DEBUGVAR inst_show_coffee_counter
Var inst_show_coffee_counter = inst_show_coffee_counter - 1
If inst_show_coffee_counter = 0 Then
@ -74,7 +76,7 @@
EndIf
EndIf
EndIf
@ -83,7 +85,7 @@
Var RefreshCoffeeMenu = 0
SAVELOG "OPEN FROM 3"
Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_coffee.lxml"
EndIf
EndIf
; setvarint ScriptCoffeeMenu 1
If ScriptCoffeeMenu = 1 Then

18
inter/tha/xml/multi/v3/page_catalog_group_coffee.skt
View file

@ -41,9 +41,11 @@
Var inst_show_coffee_counter = 4
DEBUGVAR SlientRefreshIndex
Var buttonRemoveCupOnArm = "Invisible"
RefreshAll
</EventOnShow>
<Timeout> 1000 </Timeout>
@ -59,15 +61,15 @@
Else
Var ice_tab_process_show = "Invisible"
EndIf
GetVisible inst_show_coffee
If inst_show_coffee = 1 Then
If inst_show_coffee_counter > 0 Then
DEBUGVAR inst_show_coffee_counter
Var inst_show_coffee_counter = inst_show_coffee_counter - 1
If inst_show_coffee_counter = 0 Then
@ -76,7 +78,7 @@
EndIf
EndIf
EndIf
@ -85,7 +87,7 @@
Var RefreshCoffeeMenu = 0
SAVELOG "OPEN FROM 3"
Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_coffee.lxml"
EndIf
EndIf
; setvarint ScriptCoffeeMenu 1
If ScriptCoffeeMenu = 1 Then
@ -110,7 +112,7 @@
<?hurr
<?hurr
#include=menu_new_layout_gen_v3.py
?>

2
inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml
View file

@ -26,6 +26,8 @@
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
Var buttonRemoveCupOnArm = "Invisible"
RefreshAll
DEBUGVAR SlientRefreshIndex
</EventOnShow>

2
inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.skt
View file

@ -28,6 +28,8 @@
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
Var buttonRemoveCupOnArm = "Invisible"
RefreshAll
DEBUGVAR SlientRefreshIndex
</EventOnShow>

24
inter/tha/xml/multi/v3/page_catalog_group_health.lxml
View file

@ -18,8 +18,8 @@
</EventOpen>
<EventOnShow>
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
Var Menu22Selected = "PressForever"
@ -31,6 +31,8 @@
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
Var buttonRemoveCupOnArm = "Invisible"
RefreshAll
DEBUGVAR SlientRefreshIndex
</EventOnShow>
@ -38,7 +40,7 @@
<Timeout> 1000 </Timeout>
<EventTimeout>
;DEBUGVAR ICE_PROCESS_STATUS
;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"
@ -52,12 +54,12 @@
GetVisible inst_show_health
If inst_show_health = 1 Then
If inst_show_health_counter > 0 Then
DEBUGVAR inst_show_health_counter
Var inst_show_health_counter = inst_show_health_counter - 1
If inst_show_health_counter = 0 Then
@ -66,7 +68,7 @@
EndIf
EndIf
EndIf
If HealthRefreshTimeOut > 15 Then
@ -75,18 +77,18 @@
EndIf
Var HealthRefreshTimeOut = HealthRefreshTimeOut + 1
If RefreshHealtMenu = 1 Then
Var RefreshHealtMenu = 0
SAVELOG "OPEN FROM 6"
Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_health.lxml"
EndIf
EndIf
; setvarint RefreshHealtMenu 1
TimerReset
</EventTimeout>

30
inter/tha/xml/multi/v3/page_catalog_group_health.skt
View file

@ -1,5 +1,5 @@
<?hurr
#include=menu_head.py
<?hurr
#include=menu_head.py
touch_less_gen = False
?>
@ -21,8 +21,8 @@
</EventOpen>
<EventOnShow>
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
Var Menu22Selected = "PressForever"
@ -34,6 +34,8 @@
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
Var buttonRemoveCupOnArm = "Invisible"
RefreshAll
DEBUGVAR SlientRefreshIndex
</EventOnShow>
@ -41,7 +43,7 @@
<Timeout> 1000 </Timeout>
<EventTimeout>
;DEBUGVAR ICE_PROCESS_STATUS
;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"
@ -55,12 +57,12 @@
GetVisible inst_show_health
If inst_show_health = 1 Then
If inst_show_health_counter > 0 Then
DEBUGVAR inst_show_health_counter
Var inst_show_health_counter = inst_show_health_counter - 1
If inst_show_health_counter = 0 Then
@ -69,7 +71,7 @@
EndIf
EndIf
EndIf
If HealthRefreshTimeOut > 15 Then
@ -78,25 +80,25 @@
EndIf
Var HealthRefreshTimeOut = HealthRefreshTimeOut + 1
If RefreshHealtMenu = 1 Then
Var RefreshHealtMenu = 0
SAVELOG "OPEN FROM 6"
Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_health.lxml"
EndIf
EndIf
; setvarint RefreshHealtMenu 1
TimerReset
</EventTimeout>
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml"
<?hurr
<?hurr
#include=menu_new_layout_gen_v3.py
?>

2
inter/tha/xml/multi/v3/page_catalog_group_milk.lxml
View file

@ -31,6 +31,8 @@
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
Var inst_show_milk_cupe_counter = 7
Var buttonRemoveCupOnArm = "Invisible"
RefreshAll
DEBUGVAR SlientRefreshIndex
</EventOnShow>

2
inter/tha/xml/multi/v3/page_catalog_group_milk.skt
View file

@ -33,6 +33,8 @@
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
Var inst_show_milk_cupe_counter = 7
Var buttonRemoveCupOnArm = "Invisible"
RefreshAll
DEBUGVAR SlientRefreshIndex
</EventOnShow>

12
inter/tha/xml/multi/v3/page_catalog_group_other.lxml
View file

@ -8,7 +8,7 @@
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
; soda and other
Var Menu6Selected = "PressForever"
@ -28,6 +28,8 @@
Var SlientRefreshIndex = 8
EndIf
Var buttonRemoveCupOnArm = "Invisible"
</EventOpen>
<Timeout> 1000 </Timeout>
@ -50,18 +52,18 @@
Var RefreshOtherOrg = 0
SAVELOG "OPEN FROM 8"
Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_other.lxml"
EndIf
EndIf
GetVisible inst_show_other_org
;DEBUGVAR inst_show_other_org
Var OtherOrgRefreshTimeOut = OtherOrgRefreshTimeOut + 1
;DEBUGVAR OtherOrgRefreshTimeOut
If OtherOrgRefreshTimeOut > 15 Then
Var OtherOrgRefreshTimeOut = 0
Script "-" "-"
If inst_show_other_org = 1 Then

18
inter/tha/xml/multi/v3/page_catalog_group_other.skt
View file

@ -1,5 +1,5 @@
<?hurr
#include=menu_head.py
<?hurr
#include=menu_head.py
echo param
?>
@ -11,7 +11,7 @@
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
; soda and other
Var Menu6Selected = "PressForever"
@ -31,6 +31,8 @@
Var SlientRefreshIndex = 8
EndIf
Var buttonRemoveCupOnArm = "Invisible"
</EventOpen>
<Timeout> 1000 </Timeout>
@ -53,18 +55,18 @@
Var RefreshOtherOrg = 0
SAVELOG "OPEN FROM 8"
Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_other.lxml"
EndIf
EndIf
GetVisible inst_show_other_org
;DEBUGVAR inst_show_other_org
Var OtherOrgRefreshTimeOut = OtherOrgRefreshTimeOut + 1
;DEBUGVAR OtherOrgRefreshTimeOut
If OtherOrgRefreshTimeOut > 15 Then
Var OtherOrgRefreshTimeOut = 0
Script "-" "-"
If inst_show_other_org = 1 Then
@ -82,7 +84,7 @@
<?hurr
<?hurr
#include=menu_new_layout_gen_v3.py
?>

19
inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml
View file

@ -7,7 +7,7 @@
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
DEBUGVAR SlientRefreshIndex
If SlientRefreshIndex = 7 Then
@ -19,7 +19,7 @@
</EventOpen>
<EventOnShow>
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
; soda and other
Var Menu62Selected = "PressForever"
@ -35,8 +35,9 @@
Var OtherOtherRefreshTimeOut = 14
DEBUGVAR SlientRefreshIndex
Var buttonRemoveCupOnArm = "Invisible"
RefreshAll
</EventOnShow>
@ -46,7 +47,7 @@
;DEBUGVAR ICE_PROCESS_STATUS
;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"
; setvarint RefreshOtherOther 1
@ -54,18 +55,18 @@
Var RefreshOtherOther = 0
SAVELOG "OPEN FROM 8"
Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml"
EndIf
EndIf
GetVisible inst_show_other_other
;DEBUGVAR inst_show_other_other
Var OtherOtherRefreshTimeOut = OtherOtherRefreshTimeOut + 1
;DEBUGVAR OtherOtherRefreshTimeOut
If OtherOtherRefreshTimeOut > 15 Then
Var OtherOtherRefreshTimeOut = 0
Script "-" "-"
If inst_show_other_other = 1 Then

25
inter/tha/xml/multi/v3/page_catalog_group_other_other.skt
View file

@ -1,5 +1,5 @@
<?hurr
#include=menu_head.py
<?hurr
#include=menu_head.py
echo param
?>
@ -10,7 +10,7 @@
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
DEBUGVAR SlientRefreshIndex
If SlientRefreshIndex = 7 Then
@ -22,7 +22,7 @@
</EventOpen>
<EventOnShow>
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
; soda and other
Var Menu62Selected = "PressForever"
@ -38,8 +38,9 @@
Var OtherOtherRefreshTimeOut = 14
DEBUGVAR SlientRefreshIndex
Var buttonRemoveCupOnArm = "Invisible"
RefreshAll
</EventOnShow>
@ -49,7 +50,7 @@
;DEBUGVAR ICE_PROCESS_STATUS
;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"
; setvarint RefreshOtherOther 1
@ -57,18 +58,18 @@
Var RefreshOtherOther = 0
SAVELOG "OPEN FROM 8"
Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml"
EndIf
EndIf
GetVisible inst_show_other_other
;DEBUGVAR inst_show_other_other
Var OtherOtherRefreshTimeOut = OtherOtherRefreshTimeOut + 1
;DEBUGVAR OtherOtherRefreshTimeOut
If OtherOtherRefreshTimeOut > 15 Then
Var OtherOtherRefreshTimeOut = 0
Script "-" "-"
If inst_show_other_other = 1 Then
@ -87,7 +88,7 @@
<?hurr
<?hurr
#include=menu_new_layout_gen_v3.py
?>

11
inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.lxml
View file

@ -34,6 +34,9 @@
SetInstanceIgnoreTouch
Var inst_show_pepsi_7up_counter = 4
Var buttonRemoveCupOnArm = "Invisible"
RefreshAll
DEBUGVAR SlientRefreshIndex
</EventOnShow>
@ -48,15 +51,15 @@
Var RefreshPepsiMenu = 0
SAVELOG "OPEN FROM 7"
Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.lxml"
EndIf
EndIf
GetVisible inst_show_pepsi_7up
If inst_show_pepsi_7up = 1 Then
If inst_show_pepsi_7up_counter > 0 Then
DEBUGVAR inst_show_pepsi_7up_counter
Var inst_show_pepsi_7up_counter = inst_show_pepsi_7up_counter - 1
If inst_show_pepsi_7up_counter = 0 Then
@ -66,7 +69,7 @@
EndIf
EndIf
TimerReset
</EventTimeout>

13
inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.skt
View file

@ -37,6 +37,9 @@
SetInstanceIgnoreTouch
Var inst_show_pepsi_7up_counter = 4
Var buttonRemoveCupOnArm = "Invisible"
RefreshAll
DEBUGVAR SlientRefreshIndex
</EventOnShow>
@ -51,15 +54,15 @@
Var RefreshPepsiMenu = 0
SAVELOG "OPEN FROM 7"
Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.lxml"
EndIf
EndIf
GetVisible inst_show_pepsi_7up
If inst_show_pepsi_7up = 1 Then
If inst_show_pepsi_7up_counter > 0 Then
DEBUGVAR inst_show_pepsi_7up_counter
Var inst_show_pepsi_7up_counter = inst_show_pepsi_7up_counter - 1
If inst_show_pepsi_7up_counter = 0 Then
@ -69,7 +72,7 @@
EndIf
EndIf
TimerReset
</EventTimeout>
@ -81,7 +84,7 @@
<?hurr
<?hurr
#include=menu_new_layout_gen_v3.py
?>

8
inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml
View file

@ -52,10 +52,16 @@
Var inst_show_exclude_group_counter = 45
EndIf
EndIf
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
EndIf
Var RecommendTimeOut = RecommendTimeOut + 1
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
TimerReset
</EventTimeout>
@ -15124,4 +15130,6 @@
;include="ROOT/taobin_project/inc/button_remove_cup.inc"
</Popup>

8
inter/tha/xml/multi/v3/page_catalog_group_recommend.skt
View file

@ -54,10 +54,16 @@
Var inst_show_exclude_group_counter = 45
EndIf
EndIf
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
EndIf
Var RecommendTimeOut = RecommendTimeOut + 1
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
TimerReset
</EventTimeout>
@ -71,4 +77,6 @@
;include="ROOT/taobin_project/inc/button_remove_cup.inc"
</Popup>

25
inter/tha/xml/multi/v3/page_catalog_group_tea.lxml
View file

@ -7,7 +7,7 @@
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
SetInstanceIgnoreTouch
DEBUGVAR SlientRefreshIndex
@ -17,16 +17,16 @@
EndIf
</EventOpen>
<EventOnShow>
; On open
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
Var Menu3Selected = "PressForever"
SAVELOG PreviseXMLFileName2
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
@ -37,25 +37,26 @@
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
Var buttonRemoveCupOnArm = "Invisible"
RefreshAll
</EventOnShow>
<Timeout> 1000 </Timeout>
<EventTimeout>
;DEBUGVAR ICE_PROCESS_STATUS
;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"
GetVisible inst_show_tea
If inst_show_tea = 1 Then
If inst_show_tea_counter > 0 Then
DEBUGVAR inst_show_tea_counter
Var inst_show_tea_counter = inst_show_tea_counter - 1
If inst_show_tea_counter = 0 Then
@ -64,9 +65,9 @@
EndIf
EndIf
EndIf
TimerReset
</EventTimeout>
@ -116,7 +117,7 @@
EndIf
EndIf
RefreshAll
</EventOnShow>

31
inter/tha/xml/multi/v3/page_catalog_group_tea.skt
View file

@ -1,5 +1,5 @@
<?hurr
#include=menu_head.py
<?hurr
#include=menu_head.py
touch_less_gen = False
?>
@ -10,7 +10,7 @@
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
SetInstanceIgnoreTouch
DEBUGVAR SlientRefreshIndex
@ -20,16 +20,16 @@
EndIf
</EventOpen>
<EventOnShow>
; On open
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
Var Menu3Selected = "PressForever"
SAVELOG PreviseXMLFileName2
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
@ -40,25 +40,26 @@
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
Var buttonRemoveCupOnArm = "Invisible"
RefreshAll
</EventOnShow>
<Timeout> 1000 </Timeout>
<EventTimeout>
;DEBUGVAR ICE_PROCESS_STATUS
;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"
GetVisible inst_show_tea
If inst_show_tea = 1 Then
If inst_show_tea_counter > 0 Then
DEBUGVAR inst_show_tea_counter
Var inst_show_tea_counter = inst_show_tea_counter - 1
If inst_show_tea_counter = 0 Then
@ -67,9 +68,9 @@
EndIf
EndIf
EndIf
TimerReset
</EventTimeout>
@ -119,7 +120,7 @@
EndIf
EndIf
RefreshAll
</EventOnShow>
@ -132,7 +133,7 @@
<?hurr
<?hurr
#include=menu_new_layout_gen_v3.py
?>

19
inter/tha/xml/multi/v3/page_catalog_group_whey.lxml
View file

@ -18,12 +18,12 @@
</EventOpen>
<EventOnShow>
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
If AppFastEnable = "true" Then
Var Menu11Selected = "PressForever"
Var Menu11Selected = "PressForever"
Var Menu7Selected = "Invisible"
Else
Var Menu11Selected = "Invisible"
Var Menu11Selected = "Invisible"
Var Menu7Selected = "PressForever"
EndIf
@ -37,6 +37,7 @@
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
DEBUGVAR SlientRefreshIndex
Var buttonRemoveCupOnArm = "Invisible"
</EventOnShow>
<Timeout> 1000 </Timeout>
@ -44,14 +45,14 @@
;DEBUGVAR ICE_PROCESS_STATUS
;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"
GetVisible inst_show_whey
If inst_show_whey = 1 Then
If inst_show_whey_counter > 0 Then
DEBUGVAR inst_show_whey_counter
Var inst_show_whey_counter = inst_show_whey_counter - 1
If inst_show_whey_counter = 0 Then
@ -60,13 +61,13 @@
EndIf
EndIf
EndIf
TimerReset
</EventTimeout>
<EventOnShow>
</EventOnShow>

25
inter/tha/xml/multi/v3/page_catalog_group_whey.skt
View file

@ -1,5 +1,5 @@
<?hurr
#include=menu_head.py
<?hurr
#include=menu_head.py
touch_less_gen = False
?>
@ -21,12 +21,12 @@
</EventOpen>
<EventOnShow>
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
If AppFastEnable = "true" Then
Var Menu11Selected = "PressForever"
Var Menu11Selected = "PressForever"
Var Menu7Selected = "Invisible"
Else
Var Menu11Selected = "Invisible"
Var Menu11Selected = "Invisible"
Var Menu7Selected = "PressForever"
EndIf
@ -40,6 +40,7 @@
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
DEBUGVAR SlientRefreshIndex
Var buttonRemoveCupOnArm = "Invisible"
</EventOnShow>
<Timeout> 1000 </Timeout>
@ -47,14 +48,14 @@
;DEBUGVAR ICE_PROCESS_STATUS
;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"
GetVisible inst_show_whey
If inst_show_whey = 1 Then
If inst_show_whey_counter > 0 Then
DEBUGVAR inst_show_whey_counter
Var inst_show_whey_counter = inst_show_whey_counter - 1
If inst_show_whey_counter = 0 Then
@ -63,13 +64,13 @@
EndIf
EndIf
EndIf
TimerReset
</EventTimeout>
<EventOnShow>
</EventOnShow>
@ -78,7 +79,7 @@
<?hurr
<?hurr
#include=menu_new_layout_gen_v3.py
?>