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

Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

Browse source
This commit is contained in:
miggaze 2022-04-04 12:32:54 +07:00
commit 91d6b38262
70 changed files with 6072 additions and 930 deletions
Download patch file Download diff file Expand all files Collapse all files

44
adv/sync_6.file Normal file
View file

@ -0,0 +1,44 @@
.:
total 85532
-rw-rw---- 1 root sdcard_rw 2671 2022-01-13 17:36 sync_0.file
-rw-rw---- 1 root sdcard_rw 2609 2021-12-25 13:13 sync_1.file
-rw-rw---- 1 root sdcard_rw 2671 2022-01-13 17:24 sync_2.file
-rw-rw---- 1 root sdcard_rw 2606 2022-02-03 17:03 sync_4.file
-rw-rw---- 1 root sdcard_rw 3028 2022-03-15 10:42 sync_5.file
-rw-rw---- 1 root sdcard_rw 0 2022-03-31 23:56 sync_6.file
-rw-rw---- 1 root sdcard_rw 3772465 2021-07-07 16:02 taobin_adv_00.mp4
-rw-rw---- 1 root sdcard_rw 3647528 2021-07-06 15:30 taobin_adv_01.mp4
-rw-rw---- 1 root sdcard_rw 3184464 2021-06-22 14:08 taobin_adv_02.mp4
-rw-rw---- 1 root sdcard_rw 4349971 2021-04-21 11:53 taobin_adv_03.mp4
-rw-rw---- 1 root sdcard_rw 3064661 2021-09-27 13:44 taobin_adv_04.mp4
-rw-rw---- 1 root sdcard_rw 2211917 2021-09-23 10:57 taobin_adv_05.mp4
-rw-rw---- 1 root sdcard_rw 3772465 2021-07-07 16:02 taobin_adv_06.mp4
-rw-rw---- 1 root sdcard_rw 1637056 2021-09-21 09:57 taobin_adv_07.mp4
-rw-rw---- 1 root sdcard_rw 1962660 2021-09-17 16:42 taobin_adv_08.mp4
-rw-rw---- 1 root sdcard_rw 1598810 2021-09-23 11:27 taobin_adv_09.mp4
-rw-rw---- 1 root sdcard_rw 2118744 2022-03-31 17:42 taobin_adv_10.mp4
-rw-rw---- 1 root sdcard_rw 1632882 2022-03-14 17:13 taobin_adv_11.mp4
-rw-rw---- 1 root sdcard_rw 2622440 2021-07-07 16:55 taobin_adv_menu2_00.mp4
-rw-rw---- 1 root sdcard_rw 2755962 2021-07-07 15:35 taobin_adv_menu2_01.mp4
-rw-rw---- 1 root sdcard_rw 2814749 2021-07-07 14:44 taobin_adv_menu2_02.mp4
-rw-rw---- 1 root sdcard_rw 3111677 2021-04-21 14:21 taobin_adv_menu2_03.mp4
-rw-rw---- 1 root sdcard_rw 2809964 2021-09-27 13:43 taobin_adv_menu2_04.mp4
-rw-rw---- 1 root sdcard_rw 1809071 2021-09-23 10:57 taobin_adv_menu2_05.mp4
-rw-rw---- 1 root sdcard_rw 2622440 2021-07-07 16:55 taobin_adv_menu2_06.mp4
-rw-rw---- 1 root sdcard_rw 1653061 2021-09-21 10:00 taobin_adv_menu2_07.mp4
-rw-rw---- 1 root sdcard_rw 2098002 2021-09-17 16:42 taobin_adv_menu2_08.mp4
-rw-rw---- 1 root sdcard_rw 1970490 2021-09-23 11:27 taobin_adv_menu2_09.mp4
-rw-rw---- 1 root sdcard_rw 1616371 2022-03-31 17:43 taobin_adv_menu2_10.mp4
-rw-rw---- 1 root sdcard_rw 1433063 2022-03-14 17:16 taobin_adv_menu2_11.mp4
-rw-rw---- 1 root sdcard_rw 2625751 2021-07-07 16:01 taobin_adv_menu_00.mp4
-rw-rw---- 1 root sdcard_rw 2587515 2021-07-07 15:35 taobin_adv_menu_01.mp4
-rw-rw---- 1 root sdcard_rw 2645861 2021-07-07 14:44 taobin_adv_menu_02.mp4
-rw-rw---- 1 root sdcard_rw 3117015 2021-04-21 14:21 taobin_adv_menu_03.mp4
-rw-rw---- 1 root sdcard_rw 2929148 2021-09-27 13:44 taobin_adv_menu_04.mp4
-rw-rw---- 1 root sdcard_rw 1885128 2021-09-23 10:57 taobin_adv_menu_05.mp4
-rw-rw---- 1 root sdcard_rw 2625751 2021-07-07 16:01 taobin_adv_menu_06.mp4
-rw-rw---- 1 root sdcard_rw 1805549 2021-09-21 10:00 taobin_adv_menu_07.mp4
-rw-rw---- 1 root sdcard_rw 1873183 2021-09-17 16:42 taobin_adv_menu_08.mp4
-rw-rw---- 1 root sdcard_rw 1967036 2021-09-23 11:27 taobin_adv_menu_09.mp4
-rw-rw---- 1 root sdcard_rw 1575807 2022-03-31 17:43 taobin_adv_menu_10.mp4
-rw-rw---- 1 root sdcard_rw 1394565 2022-03-14 17:14 taobin_adv_menu_11.mp4

BIN
adv/taobin_adv_10.mp4
View file

Binary file not shown.

BIN
adv/taobin_adv_menu2_10.mp4
View file

Binary file not shown.

BIN
adv/taobin_adv_menu_10.mp4
View file

Binary file not shown.

BIN
image/drink_option/blend_db.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 486 B

BIN
image/drink_option/cold_db.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 535 B

BIN
image/drink_option/hot_db.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 601 B

BIN
image/drink_option_en/blend_db.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 661 B

BIN
image/drink_option_en/cold_db.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 643 B

BIN
image/drink_option_en/hot_db.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 525 B

BIN
image/page_doing/txt_46.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Before After
Before After

BIN
image/page_doing/txt_46_en.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Before After
Before After

BIN
image/page_drink_disable_n/bn_iced_soda.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
image/page_drink_n/bn_iced_soda.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
image/page_drink_press_n/bn_iced_soda.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
image/topping2/bt_cold.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
image/topping2/bt_cold_disable.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
image/topping2/bt_cold_disable2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 883 B

BIN
image/topping2/bt_cold_selected.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
image/topping2/bt_hot.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

BIN
image/topping2/bt_hot_disable.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
image/topping2/bt_hot_disable2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
image/topping2/bt_hot_selected.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
image/topping2/bt_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
image/topping2/bt_smoothie_disable.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
image/topping2/bt_smoothie_disable2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
image/topping2/bt_smoothie_selected.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
image/topping2/drink_select_type.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
image/topping2_en/bt_cold.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

BIN
image/topping2_en/bt_cold_disable.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
image/topping2_en/bt_cold_disable2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 932 B

BIN
image/topping2_en/bt_cold_selected.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
image/topping2_en/bt_hot.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
image/topping2_en/bt_hot_disable.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
image/topping2_en/bt_hot_disable2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
image/topping2_en/bt_hot_selected.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
image/topping2_en/bt_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3 KiB

BIN
image/topping2_en/bt_smoothie_disable.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
image/topping2_en/bt_smoothie_disable2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
image/topping2_en/bt_smoothie_selected.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
spiral/video/sp01.mp4 Normal file
View file

Binary file not shown.

BIN
spiral/video/sp02.mp4 Normal file
View file

Binary file not shown.

86
xml/menu_catalog.xml
View file

@ -40,6 +40,16 @@
EndIf
EndIf
If IgnoreNetCore = "true" Then
Else
;stop_now
If NETCORE_LOST_CNT > 15 Then
Var stop_now = "true"
Var MachineErrorDetailAll = "???"
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1
TimerReset
@ -158,7 +168,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -171,7 +185,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
@ -187,7 +205,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -201,7 +223,13 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -217,7 +245,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -230,7 +263,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
@ -246,7 +284,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -259,7 +301,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
@ -274,7 +320,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -287,7 +337,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
@ -330,7 +384,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -343,7 +401,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>

78
xml/menu_new_layout_gen.py
View file

@ -7,6 +7,8 @@
out_xml('<Scroll> "Vertical" </Scroll>\r\n')
out_xml('<Column> 4 </Column>\r\n')
pd_code_available = '##-##-##-####'
count_test = 0
out_xml('; menu_new_list '+ str(len(menu_new_list))+'\r\n')
for spl in menu_new_list:
@ -27,7 +29,25 @@
str_con += spl[6] + '.Button,'
out_xml( '\t<State> Flag( '+ str_con + ') </State> \r\n')
pd_code_1 = spl[4]
pd_stage1 = '$' + spl[4] + '.Button'
if spl[4] == "-" or len(spl[4]) == 0 :
pd_code_1 = pd_code_available
pd_stage1 = '"Disable2"'
pd_code_2 = spl[5]
pd_stage2 = '$' + spl[5] + '.Button'
if spl[5] == "-" or len(spl[5]) == 0:
pd_code_2 = pd_code_available
pd_stage2 = '"Disable2"'
pd_code_3 = spl[6]
pd_stage3 = '$' + spl[6] + '.Button'
if spl[6] == "-" or len(spl[6]) == 0:
pd_code_3 = pd_code_available
pd_stage3 = '"Disable2"'
out_xml( '\t<Button>\r\n')
out_xml( '\t<State> Flag( '+ str_con + ') </State> \r\n')
out_xml( '\t<Filename> "' + new_default_dir + '/'+ menu_img +'" </Filename>\r\n')
@ -37,7 +57,45 @@
out_xml( '\t<Volume> SoundVolume </Volume>\r\n')
out_xml( '\t<EventOnClick> \r\n')
out_xml( '\t\tVar NameDrink = "' + spl[1].replace("\\n", " ") + '"\r\n')
out_xml( '\t\tVar NameDrinkTH = "' + spl[0].replace("\\n", " ") + '"\r\n')
out_xml( '\t\tVar DrinkDescriptionTH = "' + spl[2].replace("\\n", " ") + '"\r\n')
out_xml( '\t\tVar DrinkDescription = "' + spl[3].replace("\\n", " ") + '"\r\n')
out_xml( '\t\tTopping "Load" "'+ spl[5] +'"\r\n')
out_xml( '\t\tVar PictureDrink = "' + default_dir2 + '" + \"' + menu_img + '\"\r\n')
out_xml( '\t\tVar OpenFromXML = CurrentXMLFileName2\r\n')
out_xml( '\t\tVar PriceD1 = $' + spl[4] + '.Price\r\n')
out_xml( '\t\tVar PriceD2 = $' + spl[5] + '.Price\r\n')
out_xml( '\t\tVar PriceD3 = $' + spl[6] + '.Price\r\n')
out_xml( '\t\tVar PD_CODE1 = "' + pd_code_1 + '"\r\n')
out_xml( '\t\tVar PD_CODE2 = "' + pd_code_2 + '"\r\n')
out_xml( '\t\tVar PD_CODE3 = "' + pd_code_3 + '"\r\n')
out_xml( '\t\tVar PD_STAGE_1 = ' + pd_stage1 + '\r\n')
out_xml( '\t\tVar PD_STAGE_2 = ' + pd_stage2 + '\r\n')
out_xml( '\t\tVar PD_STAGE_3 = ' + pd_stage3 + '\r\n')
out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
out_xml( '\t\t\tVar PD_STAGE_2 = "PressForever"\r\n')
out_xml( '\t\tElse\r\n')
out_xml( '\t\t\tIf PD_STAGE_1 = "Enable" Then\r\n')
out_xml( '\t\t\t\tVar PD_STAGE_1 = "PressForever"\r\n')
out_xml( '\t\t\tElse\r\n')
out_xml( '\t\t\t\tVar PD_STAGE_3 = "PressForever"\r\n')
out_xml( '\t\t\tEndIf\r\n')
out_xml( '\t\tEndIf\r\n')
out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select4.xml"\r\n')
out_xml( '\t</EventOnClick>\r\n')
out_xml( '\t</Button>\r\n')
@ -53,7 +111,7 @@
out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
out_xml( '\t<Color> 0x322B26 </Color>\r\n')
out_xml( '\t<State> showthaiText </State>\r\n')
out_xml( '\t<Value> "' + spl[0] + '" </Value>\r\n')
out_xml( '\t<Value> "' + spl[0].replace("\\n", "\n") + '" </Value>\r\n')
out_xml( '\t</Text>\r\n')
out_xml( '\t<Text>\r\n')
@ -64,7 +122,7 @@
out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
out_xml( '\t<State> showthaiText </State>\r\n')
out_xml( '\t<Value> "' + spl[2] + '" </Value>\r\n')
out_xml( '\t<Value> "' + spl[2].replace("\\n", "\n") + '" </Value>\r\n')
out_xml( '\t</Text>\r\n')
@ -77,7 +135,7 @@
out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
out_xml( '\t<Color> 0x322B26 </Color>\r\n')
out_xml( '\t<State> showengText </State>\r\n')
out_xml( '\t<Value> "' + spl[1] + '" </Value>\r\n')
out_xml( '\t<Value> "' + spl[1].replace("\\n", "\n") + '" </Value>\r\n')
out_xml( '\t</Text>\r\n')
out_xml( '\t<Text>\r\n')
@ -88,7 +146,7 @@
out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
out_xml( '\t<State> showengText </State>\r\n')
out_xml( '\t<Value> "' + spl[3] + '" </Value>\r\n')
out_xml( '\t<Value> "' + spl[3].replace("\\n", "\n") + '" </Value>\r\n')
out_xml( '\t</Text>\r\n')
out_xml( '\t<Image>\r\n')
@ -109,6 +167,7 @@
out_xml( '\t<Y> 264 </Y>\r\n')
out_xml( '\t<State> ' + shw + ' </State>\r\n')
out_xml( '\t<Filename> Var( DirImage2 + "hot.png" ) </Filename>\r\n')
out_xml( '\t<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>\r\n')
out_xml( '\t</Image>\r\n')
out_xml( '\t<Text>\r\n')
@ -118,6 +177,7 @@
out_xml( '\t<Width>220</Width>\r\n')
out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
out_xml( '\t<State> ' + shw + ' </State>\r\n')
out_xml( '\t<Value> Var( "฿" + $' + spl[4] + '.Price ) </Value>\r\n')
@ -134,6 +194,7 @@
out_xml( '\t<X> 81 </X>\r\n')
out_xml( '\t<Y> 264 </Y>\r\n')
out_xml( '\t<Filename> Var( DirImage2 + "cold.png" ) </Filename>\r\n')
out_xml( '\t<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>\r\n')
out_xml( '\t<State> ' + shw + ' </State>\r\n')
out_xml( '\t</Image>\r\n')
@ -144,6 +205,7 @@
out_xml( '\t<Width>220</Width>\r\n')
out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
out_xml( '\t<State> ' + shw + ' </State>\r\n')
out_xml( '\t<Value> Var( "฿" + $' + spl[5] + '.Price ) </Value>\r\n')
out_xml( '\t</Text>\r\n')
@ -159,16 +221,18 @@
out_xml( '\t<X> 146 </X>\r\n')
out_xml( '\t<Y> 264 </Y>\r\n')
out_xml( '\t<Filename> Var( DirImage2 + "blend.png" ) </Filename>\r\n')
out_xml( '\t<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>\r\n')
out_xml( '\t<State> ' + shw + ' </State>\r\n')
out_xml( '\t</Image>\r\n')
out_xml( '\t<Text>\r\n')
out_xml( '\t<X> 180 </X>\r\n')
out_xml( '\t<X> 183 </X>\r\n')
out_xml( '\t<Y> 265 </Y>\r\n')
out_xml( '\t<Size> 14 </Size>\r\n')
out_xml( '\t<Width>220</Width>\r\n')
out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
out_xml( '\t<ColorDisable> 0xEAE6E1 </ColorDisable>\r\n')
out_xml( '\t<State> ' + shw + ' </State>\r\n')
out_xml( '\t<Value> Var( "฿" + $' + spl[6] + '.Price ) </Value>\r\n')
out_xml( '\t</Text>\r\n')

17
xml/page_board.xml
View file

@ -243,12 +243,12 @@
DEBUGVAR led_new
If led_new = "1" Then
LEDv2 LedDoorCupV2 7 255 194 166 20 6
LEDv2 LedDoorCupV2 Off 255 194 166 20 6
LEDv2 LedDoorLidV2 Off 255 255 255 20 6
Else
LED LedDoorCup 1 255 255 255 255
LED LedDoorCup Off 255 255 255 255
LED LedDoorLid Off 255 255 255 255
@ -415,8 +415,12 @@
;READ_FILE "/mnt/sdcard/spiral" SpiralOnline
DEBUGVAR SpiralOnline
Topping "ClearNextOrder" "-"
If NetworkStatus = "DEACTIVE" Then
Open "/ROOT/xml/offline.xml"
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
@ -443,6 +447,12 @@
EndIf
;stop_now
If NETCORE_LOST_CNT > 15 Then
Var stop_now = "true"
Var MachineErrorDetailAll = "???"
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
If MachineStage = "drink-failed" Then
@ -456,6 +466,7 @@
EndIf
If NeedUpgrade = "true" Then
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf

86
xml/page_catalog_choose_drink.xml
View file

@ -112,6 +112,16 @@
EndIf
EndIf
If IgnoreNetCore = "true" Then
Else
;stop_now
If NETCORE_LOST_CNT > 15 Then
Var stop_now = "true"
Var MachineErrorDetailAll = "???"
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1
TimerReset
@ -230,7 +240,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -243,7 +257,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
@ -259,7 +277,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -273,7 +295,13 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -289,7 +317,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -302,7 +335,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
@ -318,7 +356,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -331,7 +373,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
@ -346,7 +392,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -359,7 +409,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
@ -402,7 +456,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -415,7 +473,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>

86
xml/page_catalog_choose_drink1.xml
View file

@ -179,6 +179,16 @@
EndIf
EndIf
If IgnoreNetCore = "true" Then
Else
;stop_now
If NETCORE_LOST_CNT > 15 Then
Var stop_now = "true"
Var MachineErrorDetailAll = "???"
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1
TimerReset
@ -297,7 +307,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -310,7 +324,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
@ -326,7 +344,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -340,7 +362,13 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -356,7 +384,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -369,7 +402,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
@ -385,7 +423,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -398,7 +440,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
@ -413,7 +459,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -426,7 +476,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
@ -469,7 +523,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -482,7 +540,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>

86
xml/page_catalog_choose_drink11.xml
View file

@ -167,6 +167,16 @@
EndIf
EndIf
If IgnoreNetCore = "true" Then
Else
;stop_now
If NETCORE_LOST_CNT > 15 Then
Var stop_now = "true"
Var MachineErrorDetailAll = "???"
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1
TimerReset
@ -285,7 +295,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -298,7 +312,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
@ -314,7 +332,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -328,7 +350,13 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -344,7 +372,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -357,7 +390,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
@ -373,7 +411,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -386,7 +428,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
@ -401,7 +447,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -414,7 +464,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
@ -457,7 +511,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -470,7 +528,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>

86
xml/page_catalog_choose_drink2.xml
View file

@ -155,6 +155,16 @@
EndIf
EndIf
If IgnoreNetCore = "true" Then
Else
;stop_now
If NETCORE_LOST_CNT > 15 Then
Var stop_now = "true"
Var MachineErrorDetailAll = "???"
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1
TimerReset
@ -273,7 +283,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -286,7 +300,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
@ -302,7 +320,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -316,7 +338,13 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -332,7 +360,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -345,7 +378,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
@ -361,7 +399,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -374,7 +416,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
@ -389,7 +435,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -402,7 +452,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
@ -445,7 +499,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -458,7 +516,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>

86
xml/page_catalog_choose_drink3.xml
View file

@ -154,6 +154,16 @@
EndIf
EndIf
If IgnoreNetCore = "true" Then
Else
;stop_now
If NETCORE_LOST_CNT > 15 Then
Var stop_now = "true"
Var MachineErrorDetailAll = "???"
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1
TimerReset
@ -272,7 +282,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -285,7 +299,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
@ -301,7 +319,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -315,7 +337,13 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -331,7 +359,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -344,7 +377,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
@ -360,7 +398,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -373,7 +415,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
@ -388,7 +434,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -401,7 +451,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
@ -444,7 +498,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -457,7 +515,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>

86
xml/page_catalog_choose_drink4.xml
View file

@ -152,6 +152,16 @@
EndIf
EndIf
If IgnoreNetCore = "true" Then
Else
;stop_now
If NETCORE_LOST_CNT > 15 Then
Var stop_now = "true"
Var MachineErrorDetailAll = "???"
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1
TimerReset
@ -270,7 +280,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -283,7 +297,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
@ -299,7 +317,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -313,7 +335,13 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -329,7 +357,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -342,7 +375,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
@ -358,7 +396,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -371,7 +413,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
@ -386,7 +432,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -399,7 +449,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
@ -442,7 +496,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -455,7 +513,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>

86
xml/page_catalog_choose_drink5.xml
View file

@ -145,6 +145,16 @@
EndIf
EndIf
If IgnoreNetCore = "true" Then
Else
;stop_now
If NETCORE_LOST_CNT > 15 Then
Var stop_now = "true"
Var MachineErrorDetailAll = "???"
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1
TimerReset
@ -263,7 +273,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -276,7 +290,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
@ -292,7 +310,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -306,7 +328,13 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -322,7 +350,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -335,7 +368,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
@ -351,7 +389,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -364,7 +406,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
@ -379,7 +425,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -392,7 +442,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
@ -435,7 +489,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -448,7 +506,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>

86
xml/page_catalog_choose_drink6.xml
View file

@ -151,6 +151,16 @@
EndIf
EndIf
If IgnoreNetCore = "true" Then
Else
;stop_now
If NETCORE_LOST_CNT > 15 Then
Var stop_now = "true"
Var MachineErrorDetailAll = "???"
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1
TimerReset
@ -269,7 +279,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -282,7 +296,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
@ -298,7 +316,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -312,7 +334,13 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -328,7 +356,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -341,7 +374,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
@ -357,7 +395,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -370,7 +412,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
@ -385,7 +431,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -398,7 +448,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
@ -441,7 +495,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -454,7 +512,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>

86
xml/page_catalog_choose_drink7.xml
View file

@ -167,6 +167,16 @@
EndIf
EndIf
If IgnoreNetCore = "true" Then
Else
;stop_now
If NETCORE_LOST_CNT > 15 Then
Var stop_now = "true"
Var MachineErrorDetailAll = "???"
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1
TimerReset
@ -285,7 +295,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -298,7 +312,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
@ -314,7 +332,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -328,7 +350,13 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -344,7 +372,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -357,7 +390,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
@ -373,7 +411,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -386,7 +428,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
@ -401,7 +447,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -414,7 +464,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
@ -457,7 +511,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -470,7 +528,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>

86
xml/page_catalog_choose_drink8.xml
View file

@ -147,6 +147,16 @@
EndIf
EndIf
If IgnoreNetCore = "true" Then
Else
;stop_now
If NETCORE_LOST_CNT > 15 Then
Var stop_now = "true"
Var MachineErrorDetailAll = "???"
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1
TimerReset
@ -265,7 +275,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -278,7 +292,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>
@ -294,7 +312,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -308,7 +330,13 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
@ -324,7 +352,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -337,7 +370,12 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
@ -353,7 +391,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -366,7 +408,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
@ -381,7 +427,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -394,7 +444,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
@ -437,7 +491,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>
<Button>
@ -450,7 +508,11 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>

22
xml/page_catalog_group_appfast.skt
View file

@ -14,13 +14,27 @@
#include=menu_catalog_default_init.xml
?>
If SpiralOnline = "true" Then
Var Menu2Selected2 = "PressForever"
If AppFastEnable = "true" Then
Var Menu11Selected2 = "PressForever"
Var Menu7Selected2 = "Invisible"
Else
Var Menu11Selected2 = "Invisible"
Var Menu7Selected2 = "PressForever"
EndIf
Else
; coffee show
Var Menu2Selected = "PressForever"
If AppFastEnable = "true" Then
Var Menu11Selected = "PressForever"
Var Menu7Selected = "Invisible"
Else
Var Menu11Selected = "Invisible"
Var Menu7Selected = "PressForever"
EndIf
EndIf
SAVELOG PreviseXMLFileName2

1577
xml/page_catalog_group_coffee.xml
View file

File diff suppressed because it is too large Load diff

4
xml/page_catalog_group_milk.skt
View file

@ -15,10 +15,10 @@
?>
If SpiralOnline = "true" Then
Var Menu2Selected2 = "PressForever"
Var Menu4Selected2 = "PressForever"
Else
; coffee show
Var Menu2Selected = "PressForever"
Var Menu4Selected = "PressForever"
EndIf

635
xml/page_catalog_group_milk.xml
View file

File diff suppressed because it is too large Load diff

8
xml/page_catalog_group_other.skt
View file

@ -14,15 +14,13 @@
#include=menu_catalog_default_init.xml
?>
; soda and other
If SpiralOnline = "true" Then
Var Menu2Selected2 = "PressForever"
Var Menu6Selected2 = "PressForever"
Else
; coffee show
Var Menu2Selected = "PressForever"
Var Menu6Selected = "PressForever"
EndIf
SAVELOG PreviseXMLFileName2
Var Timeout = 0

1334
xml/page_catalog_group_other.xml
View file

File diff suppressed because it is too large Load diff

65
xml/page_catalog_group_recommend.skt Normal file
View file

@ -0,0 +1,65 @@
<?hurr
#include=menu_head.py
?>
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
<?hurr
#include=menu_catalog_default_init.xml
?>
If SpiralOnline = "true" Then
Var Menu2Selected2 = "PressForever"
Else
; coffee show
Var Menu2Selected = "PressForever"
EndIf
SAVELOG PreviseXMLFileName2
Var Timeout = 0
<?hurr
#include=menu_catalog_new_menu.xml
?>
</EventOpen>
<?hurr
#include=menu_catalog.xml
?>
<Button>
<X> 780 </X>
<Y> 500 </Y>
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
</EventClick>
</Button>
<?hurr
#include=menu_new_layout_gen.py
?>
</Popup>

4
xml/page_catalog_group_tea.skt
View file

@ -15,10 +15,10 @@
?>
If SpiralOnline = "true" Then
Var Menu2Selected2 = "PressForever"
Var Menu3Selected2 = "PressForever"
Else
; coffee show
Var Menu2Selected = "PressForever"
Var Menu3Selected = "PressForever"
EndIf

1282
xml/page_catalog_group_tea.xml
View file

File diff suppressed because it is too large Load diff

23
xml/page_catalog_group_whey.skt
View file

@ -14,13 +14,26 @@
#include=menu_catalog_default_init.xml
?>
; protein
If SpiralOnline = "true" Then
Var Menu2Selected2 = "PressForever"
Else
; coffee show
Var Menu2Selected = "PressForever"
EndIf
If AppFastEnable = "true" Then
Var Menu11Selected2 = "PressForever"
Var Menu7Selected2 = "Invisible"
Else
Var Menu11Selected2 = "Invisible"
Var Menu7Selected2 = "PressForever"
EndIf
Else
If AppFastEnable = "true" Then
Var Menu11Selected = "PressForever"
Var Menu7Selected = "Invisible"
Else
Var Menu11Selected = "Invisible"
Var Menu7Selected = "PressForever"
EndIf
EndIf
SAVELOG PreviseXMLFileName2

609
xml/page_catalog_group_whey.xml
View file

File diff suppressed because it is too large Load diff

2
xml/page_drinkok.xml
View file

@ -168,6 +168,8 @@
Var StrawStateX = "Invisible"
Var LidStateX = "Invisible"
LED LedDoorCup 1 255 255 255 255
</EventOpen>
<Timeout> 500 </Timeout>
<EventTimeout>

9
xml/page_topping_select.xml
View file

@ -20,14 +20,7 @@
Open "ROOT/taobin_project/xml/page_topping_select5.xml"
EndIf
If JXMLVersionInt >= 369 Then
If EnableSelectMenuBetweenBrew = "Enable" Then
Open "ROOT/taobin_project/xml/page_topping_select4.xml"
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_topping_select3.xml"
Open "ROOT/taobin_project/xml/page_topping_select4.xml"
Var ToppingGotoPayment = "true"

339
xml/page_topping_select4.xml
View file

@ -7,6 +7,7 @@
<EventOpen>
Var y_topping_bg = 912
WEB "DISABLE"
DEBUGVAR Seeker
DEBUGVAR video_menu_0
@ -155,11 +156,6 @@
EndIf
EndIf
DEBUGVAR GetFreeFromError
If GetFreeFromError = 1 Then
Var btnAddCart = "Invisible"
EndIf
Var LidDeactiveButton = "Invisible"
Var StrawDeactiveButton = "Invisible"
@ -170,6 +166,37 @@
Var NEW_MULTI = "Invisible"
If new_layout = "true" Then
Var show_select_type = "Enable"
Var hot_button_state = PD_STAGE_1
Var cold_button_state = PD_STAGE_2
Var blend_button_state = PD_STAGE_3
Function 2
Else
Var show_select_type = "Invisible"
EndIf
DEBUGVAR show_select_type
DEBUGVAR PriceD1
DEBUGVAR PriceD2
DEBUGVAR PriceD3
DEBUGVAR PD_CODE1
DEBUGVAR PD_CODE2
DEBUGVAR PD_CODE3
DEBUGVAR PD_STAGE_1
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -371,24 +398,28 @@
;STRCONTAIN "Smoothie" SubMenuName11 HaveSmoothie
STRCONTAIN "Smoothie" MenuCodeName HaveSmoothie
If HaveSmoothie = "true" Then
Var blendedState = "Enable"
Var blendedStateShow = "Enable"
If show_select_type = "Invisible" Then
If HaveSmoothie = "true" Then
Var blendedState = "Enable"
Var blendedStateShow = "Enable"
Var PriceDiff = SubMenuPrice1 - PriceDrinkNoTop
DEBUGVAR IsSmoRet
Var PriceDiff = SubMenuPrice1 - PriceDrinkNoTop
DEBUGVAR IsSmoRet
If IsSmoRet = "true" Then
Var blendedState = "ForceSet"
Var blendedStateTxt = "Enable"
Topping "LoadSubMenu" SubMenuProductCode1
Function 1
Else
Var blendedStateTxt = "Invisible"
EndIf
If IsSmoRet = "true" Then
Var blendedState = "ForceSet"
Var blendedStateTxt = "Enable"
Topping "LoadSubMenu" SubMenuProductCode1
Function 1
Else
Var blendedStateTxt = "Invisible"
EndIf
EndIf
Else
Var blendedStateShow = "Invisible"
EndIf
If IgnoreLidStraw = "true" Then
@ -837,6 +868,162 @@
<Scroll> "Vertical" </Scroll>
<Column> 1 </Column>
<Block>
; show_select_type
<Width> 986 </Width>
<Height> 160 </Height>
<MarginTop> 20 </MarginTop>
<State> show_select_type </State>
<Image>
<Filename> Var( DirImage + "/drink_select_type.png" )</Filename>
</Image>
<Button>
<X> 456 </X>
<Y> 72 </Y>
<State> hot_button_state </Stage>
<Mode> "No" </Mode>
<Filename> Var( DirImage + "/bt_hot.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bt_hot_selected.png" ) </FilenamePress>
<FilenameDisable> Var( DirImage + "/bt_hot_disable.png" ) </FilenameDisable>
<FilenameDisable2> Var( DirImage + "/bt_hot_disable2.png" ) </FilenameDisable2>
<FilenameForce> Var( DirImage + "/bt_hot_selected.png" ) </FilenameForce>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
SAVELOG "Press hot"
Var hot_button_state = "PressForever"
If cold_button_state = "Disable" Then
Else
If cold_button_state = "Diable2" Then
Else
Var cold_button_state = "Enable"
EndIf
EndIf
DEBUGVAR blend_button_state
If blend_button_state = "Disable" Then
Else
If blend_button_state = "Disable2" Then
Else
Var blend_button_state = "Enable"
EndIf
EndIf
Function 2
Refresh
</EventClick>
</Button>
<Button>
<X> 614 </X>
<Y> 72 </Y>
<State> cold_button_state </Stage>
<Mode> "No" </Mode>
<Filename> Var( DirImage + "/bt_cold.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bt_cold_selected.png" ) </FilenamePress>
<FilenameDisable> Var( DirImage + "/bt_cold_disable.png" ) </FilenameDisable>
<FilenameDisable2> Var( DirImage + "/bt_cold_disable2.png" ) </FilenameDisable2>
<FilenameForce> Var( DirImage + "/bt_cold_selected.png" ) </FilenameForce>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
SAVELOG "Press cold"
Var cold_button_state = "PressForever"
If hot_button_state = "Disable" Then
Else
If hot_button_state = "Disable2" Then
Else
Var hot_button_state = "Enable"
EndIf
EndIf
If blend_button_state = "Disable" Then
Else
If blend_button_state = "Disable2" Then
Else
Var blend_button_state = "Enable"
EndIf
EndIf
Function 2
Refresh
</EventClick>
</Button>
<Button>
<X> 772 </X>
<Y> 72 </Y>
<State> blend_button_state </Stage>
<Mode> "No" </Mode>
<Filename> Var( DirImage + "/bt_smoothie.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bt_smoothie_selected.png" ) </FilenamePress>
<FilenameDisable> Var( DirImage + "/bt_smoothie_disable.png" ) </FilenameDisable>
<FilenameDisable2> Var( DirImage + "/bt_smoothie_disable2.png" ) </FilenameDisable2>
<FilenameForce> Var( DirImage + "/bt_smoothie_selected.png" ) </FilenameForce>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
SAVELOG "Press blend"
Var blend_button_state = "PressForever"
If hot_button_state = "Disable" Then
Else
If hot_button_state = "Disable2" Then
Else
Var hot_button_state = "Enable"
EndIf
EndIf
If cold_button_state = "Disable" Then
Else
If cold_button_state = "Disable2" Then
Else
Var cold_button_state = "Enable"
EndIf
EndIf
Function 2
Refresh
</EventClick>
</Button>
</Block>
<Block>
@ -1284,7 +1471,12 @@
Var showShotEnable = "Press"
EndIf
Function 1
If new_layout = "true" Then
Function 2
Else
Function 1
EndIf
Refresh
@ -1316,7 +1508,12 @@
Var showShotEnable = "Press"
EndIf
Function 1
If new_layout = "true" Then
Function 2
Else
Function 1
EndIf
Refresh
@ -1678,6 +1875,16 @@
Topping "Pack" ExtendData
Else
Topping "SetNextOrder" UserSelectProductCode
Topping "__select" UserSelectProductCode
; Set option toppinng and pack
Topping "__select1-id" topping1
Topping "__select2-id" topping2
Topping "__select3-id" topping3
; Pack
Topping "__pack" ExtendData
EndIf
Var Seeker.PictureDrink = PictureDrink
@ -1790,6 +1997,94 @@
</Function1>
<Function2>
SAVELOG "FUNCTION2"
Var TOPPING_PRICE = 0
If hot_button_state = "PressForever" Then
Var PriceDrinkNoTop = PriceD1
Var UserSelectProductCode = PD_CODE1
If showShotEnable = "Disable"
Var showShotEnable = "Enable"
EndIf
Var showText4 = "Invisible"
EndIf
If cold_button_state = "PressForever" Then
Var PriceDrinkNoTop = PriceD2
Var UserSelectProductCode = PD_CODE2
If showShotEnable = "Disable"
Var showShotEnable = "Enable"
EndIf
Var showText4 = "Invisible"
EndIf
If blend_button_state = "PressForever" Then
Var PriceDrinkNoTop = PriceD3
Var UserSelectProductCode = PD_CODE3
Var showShotEnable = "Disable"
Var showText4 = "Enable"
EndIf
DEBUGVAR PriceDrinkNoTop
DEBUGVAR PriceDiff
DEBUGVAR showShotEnable
If showShotEnable = "Press" Then
If blendedState = "Press" Then
Var PriceDrinkTmp = PriceDrinkNoTop
EndIf
Var blendedState = "Disable"
Var TOPPING_PRICE = 0
;Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2
Var topping2 = toppingID2index2
Var DisableUsingCode = "true"
Var showText7 = "Enable"
SAVELOG "Select add normal shot"
Else
If blendedState = "Disable" Then
Var blendedState = "Enable"
EndIf
Var PriceDrinkTmp = PriceDrinkNoTop
Var topping2 = toppingID2index1
Var DisableUsingCode = "false"
SAVELOG "Deselect add normal shot"
Var showText7 = "Invisible"
EndIf
DEBUGVAR showShotEnable
DEBUGVAR blendedState
Var PriceDrinkTmp = PriceDrinkNoTop + TOPPING_PRICE
Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
SAVELOG PriceDrinkTmp
Var Timeout = 0
</Function2>
<Text>
<X> 924 </X>
<Y> 1804 </Y>

4
xml_main/startup.xml
View file

@ -95,8 +95,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
Var XMLPageVersion = "6.15"
Var XMLPageVersionInt = 615
Var XMLPageVersion = "6.18"
Var XMLPageVersionInt = 618
</EventOpen>
<Text>