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-16 14:32:05 +07:00
commit 0182d8dffa
8 changed files with 71 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,7 +35,8 @@ Else
Var InstanceTabOpenFile6 = "ROOT/taobin_project/inter/hkg/xml/multi/page_catalog_group_health.lxml" Var InstanceTabOpenFile6 = "ROOT/taobin_project/inter/hkg/xml/multi/page_catalog_group_health.lxml"
EndIf EndIf
Var InstanceTabOpenFile15 = "ROOT/taobin_project/inter/hkg/xml/multi/tab_menu.lxml" TabMenuLock 15
OpenInst 15 "ROOT/taobin_project/inter/hkg/xml/multi/tab_menu.lxml"
TabMenuVisibleInst 99 TabMenuVisibleInst 99

2
inter/hkg/xml/multi/menu_catalog_new.lxml
View file

@ -125,7 +125,7 @@
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_show_and_refresh.lxml" ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_open_instance.lxml"
RefreshAll RefreshAll
</EventLanguageOnChange> </EventLanguageOnChange>

11
inter/hkg/xml/multi/tab_menu.lxml
View file

@ -68,6 +68,7 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu1Selected </State> <State> Menu1Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_recommend3.png" )</Filename> <Filename> Var( DirImageAlter + "/bn_recommend3.png" )</Filename>
<FilenamePress> Var( DirImageAlter + "/bp_recommend3.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_recommend3.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -92,6 +93,7 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu2Selected </State> <State> Menu2Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_coffee2.png") </Filename> <Filename> Var( DirImageAlter + "/bn_coffee2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_coffee2.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_coffee2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -107,6 +109,7 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu3Selected </State> <State> Menu3Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_tea2.png") </Filename> <Filename> Var( DirImageAlter + "/bn_tea2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_tea2.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_tea2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -125,6 +128,7 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu4Selected </State> <State> Menu4Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename> <Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -141,6 +145,7 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu7Selected </State> <State> Menu7Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_protein2.png") </Filename> <Filename> Var( DirImageAlter + "/bn_protein2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_protein2.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_protein2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -155,6 +160,7 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu11Selected </State> <State> Menu11Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_appfast2.png") </Filename> <Filename> Var( DirImageAlter + "/bn_appfast2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_appfast2.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_appfast2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -171,6 +177,7 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu21Selected </State> <State> Menu21Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_forkid2.png") </Filename> <Filename> Var( DirImageAlter + "/bn_forkid2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_forkid2.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_forkid2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -187,6 +194,7 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu22Selected </State> <State> Menu22Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_health.png") </Filename> <Filename> Var( DirImageAlter + "/bn_health.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_health.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_health.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -201,6 +209,7 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu8Selected </State> <State> Menu8Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_cocktail.png") </Filename> <Filename> Var( DirImageAlter + "/bn_cocktail.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_cocktail.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_cocktail.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -229,6 +238,7 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu62Selected </State> <State> Menu62Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename> <Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -243,6 +253,7 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> MenuVSelected2 </State> <State> MenuVSelected2 </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_vending2.png") </Filename> <Filename> Var( DirImageAlter + "/bn_vending2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_vending2.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_vending2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>

1
inter/hkg/xml/multi/tab_menu_open_instance.lxml Normal file
View file

@ -0,0 +1 @@
OpenInst 15 "ROOT/taobin_project/inter/hkg/xml/multi/tab_menu.lxml"

2
inter/tha/support_langs
View file

@ -1 +1 @@
ENG,THAI,MSC,MYANMAR ENG,THAI,MSC,JAPAN,MYS,MYANMAR

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

@ -60,7 +60,7 @@
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml" ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_open_instance.lxml"
RefreshAll RefreshAll

1
inter/tha/xml/multi/tab_menu_open_instance.lxml Normal file
View file

@ -0,0 +1 @@
OpenInst 15 "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"

82
xml/page_topping_select8.xml
View file

@ -1821,10 +1821,17 @@
Var CustomMilkState[1] = "Enable" Var CustomMilkState[1] = "Enable"
Var CustomMilkState[2] = "Enable" Var CustomMilkState[2] = "Enable"
Else Else
Var CustomMilkState[0] = "Disable" If TOPPING11 = "milk-level" Then
Var CustomMilkState[1] = "Disable" Var CustomMilkState[0] = "Enable"
Var CustomMilkState[2] = "Disable" Var CustomMilkState[1] = "Enable"
Var CustomMilkState[2] = "Enable"
Else
Var CustomMilkState[0] = "Disable"
Var CustomMilkState[1] = "Disable"
Var CustomMilkState[2] = "Disable"
EndIf
EndIf EndIf
Else Else
Var CustomMilkState[0] = "Disable" Var CustomMilkState[0] = "Disable"
Var CustomMilkState[1] = "Disable" Var CustomMilkState[1] = "Disable"
@ -2215,15 +2222,22 @@
Var showShotNormalSoda = "Invisible" Var showShotNormalSoda = "Invisible"
Var showShotEnableSoda = "Invisible" Var showShotEnableSoda = "Invisible"
Else Else
Var showShotNormalSoda = "Disable" If toppingID13index2Status = "Enable" Then
Var showShotEnableSoda = "Disable" Var showShotEnableSoda = "Enable"
Var showShotNormalSoda = "Enable"
Else
Var showShotNormalSoda = "Disable"
Var showShotEnableSoda = "Disable"
EndIf
EndIf EndIf
EndIf EndIf
Else
Var showShotNormalSoda = "Disable"
Var showShotEnableSoda = "Disable"
EndIf EndIf
DEBUGVAR SubMenuGroupIDSlot6_1 DEBUGVAR SubMenuGroupIDSlot6_1
DEBUGVAR TOPPING3 DEBUGVAR TOPPING3
@ -2623,6 +2637,20 @@
Var CustomMilkState[2] = "Disable" Var CustomMilkState[2] = "Disable"
EndIf EndIf
If TOPPING13 = "shot coffee" Then
If showShotNormalSoda = "Enable" Then
If showShotEnableSoda = "Enable" Then
Var showShotNormalSoda = "Press"
EndIf
EndIf
Else
If showShotNormal = "Enable" Then
If showShotEnable = "Enable" Then
Var showShotNormal = "Press"
EndIf
EndIf
EndIf
Var SelectToppingType = 1 Var SelectToppingType = 1
EndIf EndIf
@ -2682,34 +2710,30 @@
EndIf EndIf
EndIf EndIf
If CustomMilkState[0] = "Enable" Then If TOPPING11 = "milk-level" Then
Var CustomMilkState[0] = "Disable"
EndIf
If CustomMilkState[1] = "Enable" Then If CustomMilkState[0] = "Disable" Then
Var CustomMilkState[1] = "Disable" Var CustomMilkState[0] = "Enable"
EndIf EndIf
If CustomMilkState[2] = "Enable" Then
Var CustomMilkState[2] = "Disable"
EndIf
If CustomMilkState[0] = "PressForever" Then If CustomMilkState[1] = "Disable" Then
Var CustomMilkState[0] = "Disable" Var CustomMilkState[1] = "Enable"
EndIf EndIf
If CustomMilkState[2] = "Disable" Then
Var CustomMilkState[2] = "Enable"
EndIf
If CustomMilkState[1] = "PressForever" Then If CustomMilkState[0] = "Enable" Then
Var CustomMilkState[1] = "Disable" If CustomMilkState[1] = "Enable" Then
EndIf If CustomMilkState[2] = "Enable" Then
If CustomMilkState[2] = "PressForever" Then Var CustomMilkState[1] = "PressForever" Then
Var CustomMilkState[2] = "Disable" EndIf
EndIf
If CustomMilkState[0] = "Enable" Then
If CustomMilkState[1] = "Enable" Then
If CustomMilkState[2] = "Enable" Then
Var CustomMilkState[1] = "PressForever" Then
EndIf EndIf
EndIf EndIf
Else
Var CustomMilkState[0] = "Disable"
Var CustomMilkState[1] = "Disable"
Var CustomMilkState[2] = "Disable"
EndIf EndIf
If TOPPING13 = "shot coffee" Then If TOPPING13 = "shot coffee" Then