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-07-15 15:07:04 +07:00
commit c2543a36ff
36 changed files with 18379 additions and 6938 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/event/pepsi_banner.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 571 KiB

BIN
image/page2/bn_Dessert.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 41 KiB

BIN
image/page2/bp_Dessert.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 91 KiB

BIN
image/page2_en/page2/bn_Dessert.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 41 KiB

BIN
image/page2_en/page2/bp_Dessert.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 92 KiB

BIN
image/page2_inter/bn_Dessert.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 40 KiB

BIN
image/page2_inter/bp_Dessert.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 90 KiB

BIN
image/page3_2_v2/bn_dessert.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
image/page3_2_v2/bp_dessert.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
image/page3_2_v2_en/bn_dessert.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
image/page3_2_v2_en/bp_dessert.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

2
inter/tha/menu/lang.tsv
View file

@ -15,7 +15,7 @@
000008 Protein\nShake โปรตีนเชค 蛋白奶昔 プロテインシェイク Protein\nShake ပရိုတင်း\nShake 000008 Protein\nShake โปรตีนเชค 蛋白奶昔 プロテインシェイク Protein\nShake ပရိုတင်း\nShake
000009 Soda & others โซดา และ อื่นๆ 汽水 ソーダ、その他 Soda & others ဆိုဒါနှင့် အခြားအရာများ 000009 Soda & others โซดา และ อื่นๆ 汽水 ソーダ、その他 Soda & others ဆိုဒါနှင့် အခြားအရာများ
000010 Healthier\nChoice ทางเลือกสุขภาพ\n[\nคุมจำนวน ไขมัน น้ำตาล โซเดียม\nแคลอรี่ต่ำ###Font=KanitRegular,Size=12,Align=Center] 更健康的选择 - Healthier\nChoice ကျန်းမာရေး\nရွေးချယ်မှု 000010 Healthier\nChoice ทางเลือกสุขภาพ\n[\nคุมจำนวน ไขมัน น้ำตาล โซเดียม\nแคลอรี่ต่ำ###Font=KanitRegular,Size=12,Align=Center] 更健康的选择 - Healthier\nChoice ကျန်းမာရေး\nရွေးချယ်မှု
000011 Kid Menu เมนูเด็ก 儿童菜单 - Kid Menu ကလေးမီနူး 000011 Dessert ขนมหวาน 甜品 デザート Pencuci mulut အချိုပွဲ
000012 App Fast แอพ ฟาสท์ 应用快速 - App Fast အက်ပ် အမြန် 000012 App Fast แอพ ฟาสท์ 应用快速 - App Fast အက်ပ် အမြန်
000025 Pepsi & 7up เป๊ปซี่ และ\nเซเว่นอัพ Pepsi & 7up - - Pepsi & 7up 000025 Pepsi & 7up เป๊ปซี่ และ\nเซเว่นอัพ Pepsi & 7up - - Pepsi & 7up
000026 Tao Pun เต่าปั่น Tao Pun Tao Pun Tao Pun Tao Pun 000026 Tao Pun เต่าปั่น Tao Pun Tao Pun Tao Pun Tao Pun

Can't render this file because it has a wrong number of fields in line 22.

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

@ -53,11 +53,11 @@ If WheyButtonState = "Enable" Then
Var InstanceTabOpenFile5 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion Var InstanceTabOpenFile5 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
Var InstanceTabOpenFile5 = InstanceTabOpenFile5 + "/page_catalog_group_whey.lxml" Var InstanceTabOpenFile5 = InstanceTabOpenFile5 + "/page_catalog_group_whey.lxml"
Else Else
OpenRedirect "/taobin_project/xml/page_catalog_group_forkid.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev" OpenRedirect "/taobin_project/xml/page_catalog_group_dessert.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev"
OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev" OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_dessert.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev"
OpenRedirect "/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_forkid.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev" OpenRedirect "/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_dessert.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev"
Var InstanceTabOpenFile5 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion Var InstanceTabOpenFile5 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
Var InstanceTabOpenFile5 = InstanceTabOpenFile5 + "/page_catalog_group_forkid.lxml" Var InstanceTabOpenFile5 = InstanceTabOpenFile5 + "/page_catalog_group_dessert.lxml"
EndIf EndIf
If MenuKidButtonState = "Enable" Then If MenuKidButtonState = "Enable" Then

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

@ -283,7 +283,7 @@
Var PepsiCatalogStage = "Invisible" Var PepsiCatalogStage = "Invisible"
Var Menu20BahtStage = "Enable" Var Menu20BahtStage = "Enable"
Else Else
Var PepsiCatalogStage = "Enable" Var PepsiCatalogStage = "Invisible"
Var Menu20BahtStage = "Invisible" Var Menu20BahtStage = "Invisible"
EndIf EndIf
@ -942,11 +942,12 @@
<Width> 296 </Width> <Width> 296 </Width>
<Height> 344 </Height> <Height> 344 </Height>
<MarginLeft> 42 </MarginLeft> <MarginLeft> 42 </MarginLeft>
<MarginBottom> 50 </MarginBottom>
<State>MenuKidButtonState</State> <State>MenuKidButtonState</State>
<Button> <Button>
<State>MenuKidButtonState</State> <State>MenuKidButtonState</State>
<Filename> Var(DirImage + "/bn_kidmenu.png") </Filename> <Filename> Var(DirImage + "/bn_dessert.png") </Filename>
<FilenamePress> Var(DirImage + "/bn_kidmenu.png") </FilenamePress> <FilenamePress> Var(DirImage + "/bp_dessert.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
@ -965,7 +966,7 @@
<Language> <Language>
<ID> 000011 </ID> <ID> 000011 </ID>
<X> 28 </X> <X> 28 </X>
<Y> 211 </Y> <Y> 251 </Y>
<Width> 241 </Width> <Width> 241 </Width>
<Height> 72 </Height> <Height> 72 </Height>
</Language> </Language>

33
inter/tha/xml/multi/tab_menu.lxml
View file

@ -201,8 +201,8 @@
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu21Selected </State> <State> Menu21Selected </State>
<Mode> "No" </Mode> <Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_forkid2.png") </Filename> <Filename> Var( DirImageAlter + "/bn_dessert.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_forkid2.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_dessert.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
@ -244,20 +244,21 @@
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml" OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
</EventClick> </EventClick>
</Button> </Button>
<Button>
<Layout> "linear" </Layout> ;<Button>
<State> Menu61Selected </State> ;<Layout> "linear" </Layout>
<Mode> "No" </Mode> ;<State> Menu61Selected </State>
<Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename> ;<Mode> "No" </Mode>
<FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress> ;<Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> ;<FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
<Volume> SoundVolume </Volume> ;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<EventClick> ;<Volume> SoundVolume </Volume>
Var NextPage = "-" ;<EventClick>
TabMenuVisibleInst 8 ; Var NextPage = "-"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml" ; TabMenuVisibleInst 8
</EventClick> ; OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
</Button> ;</EventClick>
;</Button>
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>

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

File diff suppressed because it is too large Load diff

11
inter/tha/xml/multi/v3/menu_new_layout_gen_v3.py
View file

@ -560,6 +560,17 @@
out_xml('\t<Menus>\n') out_xml('\t<Menus>\n')
out_xml(';banners\n') out_xml(';banners\n')
if current_file_name == "page_catalog_group_other_other.skt":
out_xml('\t<Banner>\n')
out_xml('\t\t<State> "Enable" </State>\n')
out_xml('\t\t<Type> IMAGE </Type>\n')
out_xml('\t\t<Media> "ROOT/taobin_project/image/event/pepsi_banner.png" </Media>\n')
out_xml('\t\t<EventOnClick>\n')
out_xml('\t\t\tTabMenuVisibleInst 8\n')
out_xml('\t\t\tOpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.lxml"\n')
out_xml('\t\t</EventOnClick>\n')
out_xml('\t</Banner>\n')
count_test = 0 count_test = 0
count = 0 count = 0
pd_code_available = '##-##-##-####' pd_code_available = '##-##-##-####'

6347
inter/tha/xml/multi/v3/page_catalog_group_dessert.lxml Normal file
View file

File diff suppressed because it is too large Load diff

91
inter/tha/xml/multi/v3/page_catalog_group_dessert.skt Normal file
View file

@ -0,0 +1,91 @@
<?hurr
#include=menu_head.py
touch_less_gen = False
?>
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
SetInstanceIgnoreTouch
DEBUGVAR SlientRefreshIndex
If SlientRefreshIndex = 5 Then
Var SlientRefreshIndex = 6
EndIf
</EventOpen>
<EventOnShow>
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
; protein
If AppFastEnable = "true" Then
Var Menu11Selected = "PressForever"
Var Menu7Selected = "Invisible"
Var Menu21Selected = "Invisible"
Else
Var Menu11Selected = "Invisible"
Var Menu7Selected = "Invisible"
Var Menu21Selected = "PressForever"
EndIf
Var Timeout = 0
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
SetInstanceIgnoreTouch
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
Var inst_show_for_kid_counter = 4
RefreshAll
DEBUGVAR SlientRefreshIndex
</EventOnShow>
<Timeout> 1000 </Timeout>
<EventTimeout>
;DEBUGVAR ICE_PROCESS_STATUS
;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"
GetVisible inst_show_for_kid
If inst_show_for_kid = 1 Then
If inst_show_for_kid_counter > 0 Then
Var inst_show_for_kid_counter = inst_show_for_kid_counter - 1
If inst_show_for_kid_counter = 0 Then
RefreshAll
Var inst_show_for_kid_counter = 15
EndIf
EndIf
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
EndIf
TimerReset
</EventTimeout>
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml"
<?hurr
#include=menu_new_layout_gen_v3.py
?>
</Popup>

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

File diff suppressed because it is too large Load diff

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

File diff suppressed because it is too large Load diff

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

File diff suppressed because it is too large Load diff

1684
inter/tha/xml/multi/v3/page_catalog_group_recommend_multi_pro.lxml
View file

File diff suppressed because it is too large Load diff

2
ui/lang.tsv
View file

@ -15,7 +15,7 @@
000008 Protein\nShake โปรตีนเชค 蛋白奶昔 プロテインシェイク Protein\nShake ပရိုတင်း\nShake 000008 Protein\nShake โปรตีนเชค 蛋白奶昔 プロテインシェイク Protein\nShake ပရိုတင်း\nShake
000009 Soda & others โซดา และ อื่นๆ 汽水 ソーダ、その他 Soda & others ဆိုဒါနှင့် အခြားအရာများ 000009 Soda & others โซดา และ อื่นๆ 汽水 ソーダ、その他 Soda & others ဆိုဒါနှင့် အခြားအရာများ
000010 Healthier\nChoice ทางเลือกสุขภาพ\n[\nคุมจำนวน ไขมัน น้ำตาล โซเดียม\nแคลอรี่ต่ำ###Font=KanitRegular,Size=12,Align=Center] 更健康的选择 - Healthier\nChoice ကျန်းမာရေး\nရွေးချယ်မှု 000010 Healthier\nChoice ทางเลือกสุขภาพ\n[\nคุมจำนวน ไขมัน น้ำตาล โซเดียม\nแคลอรี่ต่ำ###Font=KanitRegular,Size=12,Align=Center] 更健康的选择 - Healthier\nChoice ကျန်းမာရေး\nရွေးချယ်မှု
000011 Kid Menu เมนูเด็ก 儿童菜单 - Kid Menu ကလေးမီနူး 000011 Dessert ขนมหวาน 甜品 デザート Pencuci mulut အချိုပွဲ
000012 App Fast แอพ ฟาสท์ 应用快速 - App Fast အက်ပ် အမြန် 000012 App Fast แอพ ฟาสท์ 应用快速 - App Fast အက်ပ် အမြန်
000025 Pepsi & 7up เป๊ปซี่ และ\nเซเว่นอัพ Pepsi & 7up - - Pepsi & 7up 000025 Pepsi & 7up เป๊ปซี่ และ\nเซเว่นอัพ Pepsi & 7up - - Pepsi & 7up
000026 Tao Pun เต่าปั่น Tao Pun Tao Pun Tao Pun Tao Pun 000026 Tao Pun เต่าปั่น Tao Pun Tao Pun Tao Pun Tao Pun

Can't render this file because it has a wrong number of fields in line 22.

948
xml/event/promotion_americano.xml
View file

File diff suppressed because it is too large Load diff

948
xml/event/promotion_apple_farm_festival.xml
View file

File diff suppressed because it is too large Load diff

948
xml/event/promotion_taiwanese_tea.xml
View file

File diff suppressed because it is too large Load diff

62
xml/function2.inc
View file

@ -141,20 +141,29 @@
Var popup_discount_hot_show = "Invisible" Var popup_discount_hot_show = "Invisible"
EndIf EndIf
If PriceDiscount[1] > 0 Then If PriceDiscount[1] > 0 Then
Var text_cold_color = "0xFF0000" If cold_button_state = "Enable" Then
Var popup_discount_cold_show = "Enable" Var text_cold_color = "0xFF0000"
Var popup_discount_cold_show = "Enable"
Else
Var popup_discount_cold_show = "Invisible"
EndIf
Else Else
Var text_cold_color = "0x84776F" Var text_cold_color = "0x84776F"
Var popup_discount_cold_show = "Invisible" Var popup_discount_cold_show = "Invisible"
EndIf EndIf
If PriceDiscount[2] > 0 Then If PriceDiscount[2] > 0 Then
Var text_blender_color = "0xFF0000" If blend_button_state = "Enable" Then
If text_show_eng = "Enable" Then Var text_blender_color = "0xFF0000"
Var popup_discount_blend_show_eng = "Enable" If text_show_eng = "Enable" Then
Var popup_discount_blend_show_thai = "Invisible" Var popup_discount_blend_show_eng = "Enable"
Var popup_discount_blend_show_thai = "Invisible"
Else
Var popup_discount_blend_show_eng = "Invisible"
Var popup_discount_blend_show_thai = "Enable"
EndIf
Else Else
Var popup_discount_blend_show_eng = "Invisible" Var popup_discount_blend_show_eng = "Invisible"
Var popup_discount_blend_show_thai = "Enable" Var popup_discount_blend_show_thai = "Invisible"
EndIf EndIf
Else Else
Var text_blender_color = "0x84776F" Var text_blender_color = "0x84776F"
@ -203,8 +212,12 @@
Var Seeker.NameDrinkTH = menu_name_thai_cold Var Seeker.NameDrinkTH = menu_name_thai_cold
If PriceDiscount[0] > 0 Then If PriceDiscount[0] > 0 Then
Var text_hot_color = "0xFF0000" If hot_button_state = "Enable" Then
Var popup_discount_hot_show = "Enable" Var text_hot_color = "0xFF0000"
Var popup_discount_hot_show = "Enable"
Else
Var popup_discount_hot_show = "Invisible"
EndIf
Else Else
Var text_hot_color = "0x84776F" Var text_hot_color = "0x84776F"
Var popup_discount_hot_show = "Invisible" Var popup_discount_hot_show = "Invisible"
@ -214,13 +227,18 @@
Var popup_discount_cold_show = "Invisible" Var popup_discount_cold_show = "Invisible"
EndIf EndIf
If PriceDiscount[2] > 0 Then If PriceDiscount[2] > 0 Then
Var text_blender_color = "0xFF0000" If blend_button_state = "Enable" Then
If text_show_eng = "Enable" Then Var text_blender_color = "0xFF0000"
Var popup_discount_blend_show_eng = "Enable" If text_show_eng = "Enable" Then
Var popup_discount_blend_show_thai = "Invisible" Var popup_discount_blend_show_eng = "Enable"
Var popup_discount_blend_show_thai = "Invisible"
Else
Var popup_discount_blend_show_eng = "Invisible"
Var popup_discount_blend_show_thai = "Enable"
EndIf
Else Else
Var popup_discount_blend_show_eng = "Invisible" Var popup_discount_blend_show_eng = "Invisible"
Var popup_discount_blend_show_thai = "Enable" Var popup_discount_blend_show_thai = "Invisible"
EndIf EndIf
Else Else
Var text_blender_color = "0x84776F" Var text_blender_color = "0x84776F"
@ -277,15 +295,23 @@
Var Seeker.NameDrinkTH = menu_name_thai_blender Var Seeker.NameDrinkTH = menu_name_thai_blender
If PriceDiscount[0] > 0 Then If PriceDiscount[0] > 0 Then
Var text_hot_color = "0xFF0000" If hot_button_state = "Enable" Then
Var popup_discount_hot_show = "Enable" Var text_hot_color = "0xFF0000"
Var popup_discount_hot_show = "Enable"
Else
Var popup_discount_hot_show = "Invisible"
EndIf
Else Else
Var text_hot_color = "0x84776F" Var text_hot_color = "0x84776F"
Var popup_discount_hot_show = "Invisible" Var popup_discount_hot_show = "Invisible"
EndIf EndIf
If PriceDiscount[1] > 0 Then If PriceDiscount[1] > 0 Then
Var text_cold_color = "0xFF0000" If cold_button_state = "Enable" Then
Var popup_discount_cold_show = "Enable" Var text_cold_color = "0xFF0000"
Var popup_discount_cold_show = "Enable"
Else
Var popup_discount_cold_show = "Invisible"
EndIf
Else Else
Var text_cold_color = "0x84776F" Var text_cold_color = "0x84776F"
Var popup_discount_cold_show = "Invisible" Var popup_discount_cold_show = "Invisible"

12
xml/menu_catalog.xml
View file

@ -385,26 +385,26 @@
<X> 696 </X> <X> 696 </X>
<Y> 395 </Y> <Y> 395 </Y>
<State> Menu21Selected </State> <State> Menu21Selected </State>
<Filename> Var( DirImage + "/bn_forkid.png") </Filename> <Filename> Var( DirImage + "/bn_dessert.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_forkid.png") </FilenamePress> <FilenamePress> Var( DirImage + "/bp_dessert.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
Var NextPage = "-" Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" Open "ROOT/taobin_project/xml/page_catalog_group_dessert.xml"
</EventClick> </EventClick>
</Button> </Button>
<Button> <Button>
<X> 611 </X> <X> 611 </X>
<Y> 395 </Y> <Y> 395 </Y>
<State> Menu21Selected2 </State> <State> Menu21Selected2 </State>
<Filename> Var( DirImage + "/bn_forkid2.png") </Filename> <Filename> Var( DirImage + "/bn_dessert.png") </Filename>
<FilenamePress> Var( DirImage + "/bp_forkid2.png") </FilenamePress> <FilenamePress> Var( DirImage + "/bp_dessert.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
Var NextPage = "-" Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" Open "ROOT/taobin_project/xml/page_catalog_group_dessert.xml"
</EventClick> </EventClick>
</Button> </Button>

6
xml/menu_catalog_new.xml
View file

@ -281,8 +281,8 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu21Selected </State> <State> Menu21Selected </State>
<Filename> Var( DirImageAlter + "/bn_forkid2.png") </Filename> <Filename> Var( DirImageAlter + "/bn_dessert.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_forkid2.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_dessert.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
@ -293,7 +293,7 @@
OpenInst 2 OpenFileXML OpenInst 2 OpenFileXML
Else Else
Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" Open "ROOT/taobin_project/xml/page_catalog_group_dessert.xml"
EndIf EndIf
</EventClick> </EventClick>
</Button> </Button>

8
xml/page_catalog3.xml
View file

@ -512,15 +512,15 @@
<Button> <Button>
<X> 392 </X> <X> 392 </X>
<Y> 1532 </Y> <Y> 1478 </Y>
<State>MenuKidButtonState</State> <State>MenuKidButtonState</State>
<Filename> Var(DirImage + "/bn_kidmenu.png") </Filename> <Filename> Var(DirImage + "/bn_dessert.png") </Filename>
<FilenamePress> Var(DirImage + "/bn_kidmenu.png") </FilenamePress> <FilenamePress> Var(DirImage + "/bp_dessert.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" Open "ROOT/taobin_project/xml/page_catalog_group_dessert.xml"
</EventClick> </EventClick>
</Button> </Button>

51
xml/page_catalog_group_dessert.skt Normal file
View file

@ -0,0 +1,51 @@
<?hurr
#include=menu_head.py
touch_less_gen = False
?>
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
; protein
If AppFastEnable = "true" Then
Var Menu11Selected = "PressForever"
Var Menu7Selected = "Invisible"
Var Menu21Selected = "Invisible"
Else
Var Menu11Selected = "Invisible"
Var Menu7Selected = "Invisible"
Var Menu21Selected = "PressForever"
EndIf
SAVELOG PreviseXMLFileName2
Var Timeout = 0
;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
</EventOpen>
;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
<?hurr
#include=menu_new_layout_gen_v2.py
?>
<?hurr
#include=menu_new_layout_gen.py
?>
</Popup>

4870
xml/page_catalog_group_dessert.xml Normal file
View file

File diff suppressed because it is too large Load diff

8
xml/page_catalog_with_vending.xml
View file

@ -422,15 +422,15 @@
<Button> <Button>
<X> 392 </X> <X> 392 </X>
<Y> 1532 </Y> <Y> 1478 </Y>
<State>MenuKidButtonState</State> <State>MenuKidButtonState</State>
<Filename> Var(DirImage + "/bn_kidmenu.png") </Filename> <Filename> Var(DirImage + "/bn_dessert.png") </Filename>
<FilenamePress> Var(DirImage + "/bn_kidmenu.png") </FilenamePress> <FilenamePress> Var(DirImage + "/bp_dessert.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" Open "ROOT/taobin_project/xml/page_catalog_group_dessert.xml"
</EventClick> </EventClick>
</Button> </Button>

66
xml/page_topping_select7.xml
View file

@ -414,6 +414,7 @@
If hot_button_state = "Disable2" Then If hot_button_state = "Disable2" Then
Var text_price_d1 = "" Var text_price_d1 = ""
Var text_price_original_d1 = "" Var text_price_original_d1 = ""
Var popup_discount_hot_show = "Invisible"
Else Else
Var text_price_d1 !assigned StringFmt( PriceD1 , DisplayFormat, PreScaleConvertShow) Var text_price_d1 !assigned StringFmt( PriceD1 , DisplayFormat, PreScaleConvertShow)
Var text_price_original_d1 !assigned StringFmt( PriceMain[0] , DisplayFormat, PreScaleConvertShow) Var text_price_original_d1 !assigned StringFmt( PriceMain[0] , DisplayFormat, PreScaleConvertShow)
@ -428,6 +429,7 @@
If cold_button_state = "Disable2" Then If cold_button_state = "Disable2" Then
Var text_price_d2 = "" Var text_price_d2 = ""
Var text_price_original_d2 = "" Var text_price_original_d2 = ""
Var popup_discount_cold_show = "Invisible"
Else Else
Var text_price_d2 !assigned StringFmt( PriceD2 , DisplayFormat, PreScaleConvertShow) Var text_price_d2 !assigned StringFmt( PriceD2 , DisplayFormat, PreScaleConvertShow)
Var text_price_original_d2 !assigned StringFmt( PriceMain[1] , DisplayFormat, PreScaleConvertShow) Var text_price_original_d2 !assigned StringFmt( PriceMain[1] , DisplayFormat, PreScaleConvertShow)
@ -442,6 +444,8 @@
If blend_button_state = "Disable2" Then If blend_button_state = "Disable2" Then
Var text_price_d3 = "" Var text_price_d3 = ""
Var text_price_original_d3 = "" Var text_price_original_d3 = ""
Var popup_discount_blend_show_eng = "Invisible"
Var popup_discount_blend_show_thai = "Invisible"
Else Else
Var text_price_d3 !assigned StringFmt( PriceD3 , DisplayFormat, PreScaleConvertShow) Var text_price_d3 !assigned StringFmt( PriceD3 , DisplayFormat, PreScaleConvertShow)
Var text_price_original_d3 !assigned StringFmt( PriceMain[2] , DisplayFormat, PreScaleConvertShow) Var text_price_original_d3 !assigned StringFmt( PriceMain[2] , DisplayFormat, PreScaleConvertShow)
@ -7818,20 +7822,29 @@
Var popup_discount_hot_show = "Invisible" Var popup_discount_hot_show = "Invisible"
EndIf EndIf
If PriceDiscount[1] > 0 Then If PriceDiscount[1] > 0 Then
Var text_cold_color = "0xFF0000" If cold_button_state = "Enable" Then
Var popup_discount_cold_show = "Enable" Var text_cold_color = "0xFF0000"
Var popup_discount_cold_show = "Enable"
Else
Var popup_discount_cold_show = "Invisible"
EndIf
Else Else
Var text_cold_color = "0x84776F" Var text_cold_color = "0x84776F"
Var popup_discount_cold_show = "Invisible" Var popup_discount_cold_show = "Invisible"
EndIf EndIf
If PriceDiscount[2] > 0 Then If PriceDiscount[2] > 0 Then
Var text_blender_color = "0xFF0000" If blend_button_state = "Enable" Then
If text_show_eng = "Enable" Then Var text_blender_color = "0xFF0000"
Var popup_discount_blend_show_eng = "Enable" If text_show_eng = "Enable" Then
Var popup_discount_blend_show_thai = "Invisible" Var popup_discount_blend_show_eng = "Enable"
Var popup_discount_blend_show_thai = "Invisible"
Else
Var popup_discount_blend_show_eng = "Invisible"
Var popup_discount_blend_show_thai = "Enable"
EndIf
Else Else
Var popup_discount_blend_show_eng = "Invisible" Var popup_discount_blend_show_eng = "Invisible"
Var popup_discount_blend_show_thai = "Enable" Var popup_discount_blend_show_thai = "Invisible"
EndIf EndIf
Else Else
Var text_blender_color = "0x84776F" Var text_blender_color = "0x84776F"
@ -7876,8 +7889,12 @@
Var Seeker.NameDrinkPOS = menu_name_for_aot_eng_cold Var Seeker.NameDrinkPOS = menu_name_for_aot_eng_cold
If PriceDiscount[0] > 0 Then If PriceDiscount[0] > 0 Then
Var text_hot_color = "0xFF0000" If hot_button_state = "Enable" Then
Var popup_discount_hot_show = "Enable" Var text_hot_color = "0xFF0000"
Var popup_discount_hot_show = "Enable"
Else
Var popup_discount_hot_show = "Invisible"
EndIf
Else Else
Var text_hot_color = "0x84776F" Var text_hot_color = "0x84776F"
Var popup_discount_hot_show = "Invisible" Var popup_discount_hot_show = "Invisible"
@ -7887,13 +7904,18 @@
Var popup_discount_cold_show = "Invisible" Var popup_discount_cold_show = "Invisible"
EndIf EndIf
If PriceDiscount[2] > 0 Then If PriceDiscount[2] > 0 Then
Var text_blender_color = "0xFF0000" If blend_button_state = "Enable" Then
If text_show_eng = "Enable" Then Var text_blender_color = "0xFF0000"
Var popup_discount_blend_show_eng = "Enable" If text_show_eng = "Enable" Then
Var popup_discount_blend_show_thai = "Invisible" Var popup_discount_blend_show_eng = "Enable"
Var popup_discount_blend_show_thai = "Invisible"
Else
Var popup_discount_blend_show_eng = "Invisible"
Var popup_discount_blend_show_thai = "Enable"
EndIf
Else Else
Var popup_discount_blend_show_eng = "Invisible" Var popup_discount_blend_show_eng = "Invisible"
Var popup_discount_blend_show_thai = "Enable" Var popup_discount_blend_show_thai = "Invisible"
EndIf EndIf
Else Else
Var text_blender_color = "0x84776F" Var text_blender_color = "0x84776F"
@ -7946,15 +7968,23 @@
Var Seeker.NameDrinkPOS = menu_name_for_aot_eng_blender Var Seeker.NameDrinkPOS = menu_name_for_aot_eng_blender
If PriceDiscount[0] > 0 Then If PriceDiscount[0] > 0 Then
Var text_hot_color = "0xFF0000" If hot_button_state = "Enable" Then
Var popup_discount_hot_show = "Enable" Var text_hot_color = "0xFF0000"
Var popup_discount_hot_show = "Enable"
Else
Var popup_discount_hot_show = "Invisible"
EndIf
Else Else
Var text_hot_color = "0x84776F" Var text_hot_color = "0x84776F"
Var popup_discount_hot_show = "Invisible" Var popup_discount_hot_show = "Invisible"
EndIf EndIf
If PriceDiscount[1] > 0 Then If PriceDiscount[1] > 0 Then
Var text_cold_color = "0xFF0000" If cold_button_state = "Enable" Then
Var popup_discount_cold_show = "Enable" Var text_cold_color = "0xFF0000"
Var popup_discount_cold_show = "Enable"
Else
Var popup_discount_cold_show = "Invisible"
EndIf
Else Else
Var text_cold_color = "0x84776F" Var text_cold_color = "0x84776F"
Var popup_discount_cold_show = "Invisible" Var popup_discount_cold_show = "Invisible"

4
xml/page_topping_select8.xml
View file

@ -785,6 +785,7 @@
If hot_button_state = "Disable2" Then If hot_button_state = "Disable2" Then
Var text_price_d1 = "" Var text_price_d1 = ""
Var text_price_original_d1 = "" Var text_price_original_d1 = ""
Var popup_discount_hot_show = "Invisible"
Else Else
Var text_price_d1 !assigned StringFmt( PriceD1 , DisplayFormat, PreScaleConvertShow) Var text_price_d1 !assigned StringFmt( PriceD1 , DisplayFormat, PreScaleConvertShow)
Var text_price_original_d1 !assigned StringFmt( PriceMain[0] , DisplayFormat, PreScaleConvertShow) Var text_price_original_d1 !assigned StringFmt( PriceMain[0] , DisplayFormat, PreScaleConvertShow)
@ -799,6 +800,7 @@
If cold_button_state = "Disable2" Then If cold_button_state = "Disable2" Then
Var text_price_d2 = "" Var text_price_d2 = ""
Var text_price_original_d2 = "" Var text_price_original_d2 = ""
Var popup_discount_cold_show = "Invisible"
Else Else
Var text_price_d2 !assigned StringFmt( PriceD2 , DisplayFormat, PreScaleConvertShow) Var text_price_d2 !assigned StringFmt( PriceD2 , DisplayFormat, PreScaleConvertShow)
Var text_price_original_d2 !assigned StringFmt( PriceMain[1] , DisplayFormat, PreScaleConvertShow) Var text_price_original_d2 !assigned StringFmt( PriceMain[1] , DisplayFormat, PreScaleConvertShow)
@ -813,6 +815,8 @@
If blend_button_state = "Disable2" Then If blend_button_state = "Disable2" Then
Var text_price_d3 = "" Var text_price_d3 = ""
Var text_price_original_d3 = "" Var text_price_original_d3 = ""
Var popup_discount_blend_show_eng = "Invisible"
Var popup_discount_blend_show_thai = "Invisible"
Else Else
Var text_price_d3 !assigned StringFmt( PriceD3 , DisplayFormat, PreScaleConvertShow) Var text_price_d3 !assigned StringFmt( PriceD3 , DisplayFormat, PreScaleConvertShow)
Var text_price_original_d3 !assigned StringFmt( PriceMain[2] , DisplayFormat, PreScaleConvertShow) Var text_price_original_d3 !assigned StringFmt( PriceMain[2] , DisplayFormat, PreScaleConvertShow)