diff --git a/image/bn_songkran1.png b/image/bn_songkran1.png new file mode 100644 index 00000000..91ebedcd Binary files /dev/null and b/image/bn_songkran1.png differ diff --git a/image/bn_songkran1_en.png b/image/bn_songkran1_en.png new file mode 100644 index 00000000..9c584ed1 Binary files /dev/null and b/image/bn_songkran1_en.png differ diff --git a/image/bp_songkran1.png b/image/bp_songkran1.png new file mode 100644 index 00000000..e908df44 Binary files /dev/null and b/image/bp_songkran1.png differ diff --git a/image/bp_songkran1_en.png b/image/bp_songkran1_en.png new file mode 100644 index 00000000..82fe46a5 Binary files /dev/null and b/image/bp_songkran1_en.png differ diff --git a/image/page3/bn_songkran1.png b/image/page3/bn_songkran1.png new file mode 100644 index 00000000..d20c975f Binary files /dev/null and b/image/page3/bn_songkran1.png differ diff --git a/image/page3/bp_songkran1.png b/image/page3/bp_songkran1.png new file mode 100644 index 00000000..f7cc2aa3 Binary files /dev/null and b/image/page3/bp_songkran1.png differ diff --git a/video/script1.ev b/video/script1.ev index 2ad48c3a..d86b9aa5 100644 --- a/video/script1.ev +++ b/video/script1.ev @@ -3,7 +3,7 @@ DEBUGVAR BoxID If BoxID = 173149 Then Var EventTurnOn = 1 EndIf -If BoxID = 172644 Then +If BoxID = 200001 Then Var EventTurnOn = 1 EndIf @@ -12,13 +12,12 @@ If SystemDateMonthInt = 4 Then DEBUGVAR MainfileSize If MainfileSize = 8071197 Then - Var EventTurnOn = 1 - + Var EventTurnOn = 1 EndIf - EndIf + If EventTurnOn = 1 Then Var CountDownShowButton = 0 Var ShowButtonClickFull = "Invisible" - Var VideoMainPage = "ROOT/taobin_project/video/main_page_event.mp4" + Var VideoMainPage = "ROOT/taobin_project/video/main_page_event.mp4" EndIf diff --git a/video/sync_1.file b/video/sync_1.file index eff8b66f..8b0d3095 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,18 +1,18 @@ -total 104512 +total 93572 -rw-rw---- 1 root sdcard_rw 14292128 2022-12-29 13:13 brewing_adv1.mp4 -rw-rw---- 1 root sdcard_rw 8321419 2023-03-10 14:23 brewing_adv3.mp4 -rw-rw---- 1 root sdcard_rw 9268737 2022-09-28 15:26 main_page.mp4 -rw-rw---- 1 root sdcard_rw 19087285 2023-01-23 16:15 main_page_en.mp4 -rw-rw---- 1 root sdcard_rw 8071197 2023-03-16 17:27 main_page_event.mp4 --rw-rw---- 1 root sdcard_rw 8679952 2022-09-28 02:41 main_page_event_alter.mp4 -rw-rw---- 1 root sdcard_rw 8071833 2023-03-16 17:26 main_page_event_en.mp4 --rw-rw---- 1 root sdcard_rw 505 2023-03-26 21:20 script1.ev +-rw-rw---- 1 root sdcard_rw 501 2023-03-28 13:49 script1.ev -rw-rw---- 1 root sdcard_rw 295 2023-03-23 15:22 script2.ev --rw-rw---- 1 root sdcard_rw 0 2021-03-18 15:10 sync_1.file +-rw-rw---- 1 root sdcard_rw 0 2023-04-08 00:49 sync_1.file +-rw-rw---- 1 root sdcard_rw 557065 2021-02-18 15:05 taobin_brewing.mov +-rw-rw---- 1 root sdcard_rw 920095 2021-02-18 15:05 taobin_drink_ok.mov -rw-rw---- 1 root sdcard_rw 4806758 2022-06-13 18:43 taobin_save_world1.mp4 -rw-rw---- 1 root sdcard_rw 6428830 2022-06-13 18:43 taobin_save_world2.mp4 -rw-rw---- 1 root sdcard_rw 4634942 2022-06-13 18:43 taobin_save_world3.mp4 -rw-rw---- 1 root sdcard_rw 2084830 2022-06-13 18:43 taobin_thank1.mp4 -rw-rw---- 1 root sdcard_rw 7539282 2023-03-16 10:25 taobin_thank1_event.mp4 --rw-rw---- 1 root sdcard_rw 3999239 2022-09-27 02:04 taobin_thank1_event_alter.mp4 -rw-rw---- 1 root sdcard_rw 1631940 2022-06-13 18:43 taobin_thank2.mp4 diff --git a/xml/big_logo.inc b/xml/big_logo.inc new file mode 100644 index 00000000..4161f442 --- /dev/null +++ b/xml/big_logo.inc @@ -0,0 +1,43 @@ + + + + + Var BigButtonEnable = "Enable" + Refresh + + + Var BigButtonEnable = "Invisible" + Refresh + diff --git a/xml/dummy_layout.py b/xml/dummy_layout.py index 949cd10f..0ae9bdc2 100644 --- a/xml/dummy_layout.py +++ b/xml/dummy_layout.py @@ -2,13 +2,28 @@ if current_file_name == "page_catalog_group_songkran.skt": print( "dir= " + directory_to_process + "/page_catalog_group_recommend.xml"); file_xml = open(directory_to_process + "/page_catalog_group_recommend.xml", 'r') + file_content_main = file_xml.read() #print(file_xml.read()) # ; include-file=dummy_layout.inc file_inc = open(directory_to_process + "/dummy_layout.inc", 'r') file_inc_content = file_inc.read() - print( file_inc_content) - content_data = file_xml.read().replace("; include-file=dummy_layout.inc", file_inc_content) + file_inc2 = open(directory_to_process + "/big_logo.inc", 'r') + file_inc2_content = file_inc2.read() + #print( file_inc_content) + content_data = file_content_main.replace(";dummy_layout.inc", file_inc_content) + content_data = content_data.replace(";BigLogoLayout", file_inc2_content) + + begin_text = content_data.index(";TAGESP") + end_text = content_data.index(";TAGESP", begin_text + 7) + print("sub text = " + str(begin_text) + " end = " + str(end_text)) + tmp1 = content_data[: begin_text - 7] + tmp2 = content_data[ end_text:-1] + print("tmp1=" + tmp1) + print("tmp2=" + tmp2) + + content_data = tmp1 + tmp2 + file_xml3 = open(directory_to_process + "/page_catalog_group_recommend3.xml", 'w') file_xml3.write( content_data) file_xml3.close() diff --git a/xml/eventopen_menu.ev b/xml/eventopen_menu.ev index 98008d76..09c0ba96 100644 --- a/xml/eventopen_menu.ev +++ b/xml/eventopen_menu.ev @@ -1,55 +1 @@ - -; Original -;Var SoundThaiIndex = 0 -; north -;Var SoundThaiIndex = 1 -; northeast -;Var SoundThaiIndex = 2 -; south -;Var SoundThaiIndex = 3 - -;Var SongkranEnable = 0 - -If BoxID = 173149 Then - Var SongkranEnable = 1 -EndIf -If BoxID = 172527 Then - Var SongkranEnable = 1 -EndIf -If BoxID = 172644 Then - Var SongkranEnable = 1 -EndIf -If BoxID = 200001 Then - Var SongkranEnable = 1 -EndIf - -If SongkranEnable = 1 Then - - If SoundThaiIndex = 0 Then - Var SoundThaiIndex = 1 - Else - If SoundThaiIndex = 1 Then - Var SoundThaiIndex = 2 - Else - If SoundThaiIndex = 2 Then - Var SoundThaiIndex = 3 - Else - Var SoundThaiIndex = 0 - EndIf - EndIf - EndIf -Else - Var SongkranEnable = 0 - Var $12-01-02-0054.Button = "Inivisble" - Var $12-01-02-0053.Button = "Inivisble" - Var $12-02-02-0043.Button = "Inivisble" - Var $12-02-02-0044.Button = "Inivisble" - Var $12-03-02-0026.Button = "Inivisble" - Var $12-05-02-0055.Button = "Inivisble" - Var $12-05-02-0056.Button = "Inivisble" -EndIf - -DEBUGVAR SongkranEnable -DEBUGVAR SoundThaiIndex - diff --git a/xml/menu_catalog_default_init.xml b/xml/menu_catalog_default_init.xml index aad27c30..053ba93e 100644 --- a/xml/menu_catalog_default_init.xml +++ b/xml/menu_catalog_default_init.xml @@ -104,4 +104,3 @@ ; - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" diff --git a/xml/menu_catalog_new.xml b/xml/menu_catalog_new.xml index 6ca5c877..000b6658 100644 --- a/xml/menu_catalog_new.xml +++ b/xml/menu_catalog_new.xml @@ -182,6 +182,7 @@ If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" Else + If SongkranEnable = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" Else diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py index 398b9044..ecab7762 100644 --- a/xml/menu_new_layout_gen.py +++ b/xml/menu_new_layout_gen.py @@ -80,7 +80,7 @@ out_xml('\t\r\n') out_xml('\r\n') - out_xml('; include-file=dummy_layout.inc\r\n') + out_xml(';dummy_layout.inc\r\n') out_xml('; menu_new_list '+ str(len(menu_new_list))+'\r\n') @@ -89,6 +89,10 @@ if spl[0] == "IGNORE": continue + if spl[0].startswith("TAG"): + out_xml( '\t;' + spl[0] + '\r\n') + + out_xml( '\t; ==================> Len = ' + str(len(spl)) + '\r\n') menu_img = spl[7] out_xml( '\t; '+ spl[4] + ' ' + spl[5] + ' ' + spl[6]+ ' \r\n') @@ -1002,6 +1006,8 @@ out_xml( '\t\r\n') out_xml( '\r\n') + if spl[0].startswith("TAG"): + out_xml( '\t;' + spl[0] + '\r\n') count_test = count_test + 1 #if count_test > 8 : diff --git a/xml/page_board.xml b/xml/page_board.xml index c9648914..1d4b69a4 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -783,12 +783,40 @@ Var ShowPromoitonOreo = 0 EndIf + Var SongkranEnable = 0 + If BoxID = 173149 Then + Var SongkranEnable = 1 + EndIf + + If BoxID = 200001 Then + Var SongkranEnable = 1 + EndIf + If SystemDateMonthInt = 4 Then If SystemDateDayInt > 7 Then Var SongkranEnable = 1 EndIf EndIf + If SongkranEnable = 1 Then + + If SoundThaiIndex = 0 Then + Var SoundThaiIndex = 1 + Else + If SoundThaiIndex = 1 Then + Var SoundThaiIndex = 2 + Else + If SoundThaiIndex = 2 Then + Var SoundThaiIndex = 3 + Else + Var SoundThaiIndex = 0 + EndIf + EndIf + EndIf + EndIf + + + DEBUGVAR SoundThaiIndex RootLayoutVisible 3 "hide" @@ -915,7 +943,11 @@ If ShowPromoitonOreo = 1 Then OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend2.xml" Else - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.xml" + If SongkranEnable = 1 Then + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend3.xml" + Else + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf EndIf Machine DoorClose diff --git a/xml/page_catalog2.xml b/xml/page_catalog2.xml index 49bbb1db..e4ecd023 100644 --- a/xml/page_catalog2.xml +++ b/xml/page_catalog2.xml @@ -351,7 +351,11 @@ If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + If SongkranEnable = 1 Then + Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf EndIf diff --git a/xml/page_catalog_group_appfast.xml b/xml/page_catalog_group_appfast.xml index 406234b2..b4e10b07 100644 --- a/xml/page_catalog_group_appfast.xml +++ b/xml/page_catalog_group_appfast.xml @@ -114,7 +114,6 @@ ; - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" @@ -331,7 +330,12 @@ If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + + If SongkranEnable = 1 Then + Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf EndIf diff --git a/xml/page_catalog_group_cocktail.xml b/xml/page_catalog_group_cocktail.xml index ba2af102..3466b9a1 100644 --- a/xml/page_catalog_group_cocktail.xml +++ b/xml/page_catalog_group_cocktail.xml @@ -114,7 +114,6 @@ ; - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" Var Menu8Selected = "PressForever" @@ -323,7 +322,12 @@ If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + + If SongkranEnable = 1 Then + Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf EndIf diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml index c779b8b1..d5746091 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -114,7 +114,6 @@ ; - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" Var Menu2Selected = "PressForever" @@ -323,7 +322,12 @@ If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + + If SongkranEnable = 1 Then + Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf EndIf @@ -524,7 +528,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 57 +; menu_new_list 55 ; ==================> Len = 16 ; 12-01-01-0001 - - @@ -19227,504 +19231,6 @@ Sugar, Water" center-vertical-horizontal - ; ==================> Len = 11 - ; - 12-01-02-0053 - - - 33 - 22 - 225 - 296 - Flag( 12-01-02-0053.Button,$Sum1201020053) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "โอเลี้ยงจ้ำบ๊ะ" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "กาแฟ น้ำ และ น้ำแดง" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "SEXY DANCE AMERICANO" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Espresso, Salak Syrup, -water" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-01-02-0053.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-01-02-0053.Button - StringFmt( $12-01-02-0053.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum1201020053 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $12-01-02-0053.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum1201020053 - text_unavailable - center-vertical-horizontal - - - ; - - - - ; ==================> Len = 11 - ; - 12-01-02-0054 - - - 33 - 22 - 225 - 296 - Flag( 12-01-02-0054.Button,$Sum1201020054) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "โอยั๊วะเมียงู" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "กาแฟ น้ำ และ กล้วย" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "SNAKE WIFE AMERICANO" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Espresso, Tokyo Banana Syrup, - Water" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-01-02-0054.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-01-02-0054.Button - StringFmt( $12-01-02-0054.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum1201020054 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $12-01-02-0054.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum1201020054 - text_unavailable - center-vertical-horizontal - - - ; - - - ; Cart diff --git a/xml/page_catalog_group_health.xml b/xml/page_catalog_group_health.xml index 90c4f587..ae39d1e1 100644 --- a/xml/page_catalog_group_health.xml +++ b/xml/page_catalog_group_health.xml @@ -114,7 +114,6 @@ ; - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" Var Menu22Selected = "PressForever" @@ -323,7 +322,12 @@ If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + + If SongkranEnable = 1 Then + Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf EndIf diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml index 9eeba083..5fbe2245 100644 --- a/xml/page_catalog_group_milk.xml +++ b/xml/page_catalog_group_milk.xml @@ -114,7 +114,6 @@ ; - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" Var Menu4Selected = "PressForever" @@ -321,7 +320,12 @@ If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + + If SongkranEnable = 1 Then + Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf EndIf @@ -521,7 +525,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 19 +; menu_new_list 18 ; ==================> Len = 16 ; 12-03-01-0005 12-03-02-0005 12-03-03-0005 @@ -4795,254 +4799,6 @@ BANANA MILK" text_unavailable center-vertical-horizontal - - ; - - - - ; ==================> Len = 11 - ; - 12-03-02-0026 - - - 33 - 22 - 225 - 296 - Flag( 12-03-02-0026.Button,$Sum1203020026) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "โอวัลตินรถโรงเรียน" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "โอวัลติน น้ำตาล และ นม" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "MINI VAN OVANTINE" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Ovaltine, Sugar, milk" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-03-02-0026.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-02-0026.Button - StringFmt( $12-03-02-0026.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum1203020026 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $12-03-02-0026.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum1203020026 - text_unavailable - center-vertical-horizontal - ; - - - diff --git a/xml/page_catalog_group_oreo.xml b/xml/page_catalog_group_oreo.xml index 228f0d8e..7f675cb1 100644 --- a/xml/page_catalog_group_oreo.xml +++ b/xml/page_catalog_group_oreo.xml @@ -114,7 +114,6 @@ ; - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" @@ -319,7 +318,12 @@ If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + + If SongkranEnable = 1 Then + Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf EndIf diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml index 1b7187e3..74c1975e 100644 --- a/xml/page_catalog_group_other.xml +++ b/xml/page_catalog_group_other.xml @@ -114,7 +114,6 @@ ; - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" ; soda and other @@ -322,7 +321,12 @@ If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + + If SongkranEnable = 1 Then + Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf EndIf @@ -523,7 +527,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 40 +; menu_new_list 38 ; ==================> Len = 16 ; - 12-05-02-0007 12-05-03-0007 @@ -5748,502 +5752,6 @@ SODA" text_unavailable center-vertical-horizontal - - ; - - - - ; ==================> Len = 11 - ; - 12-05-02-0055 - - - 33 - 22 - 225 - 296 - Flag( 12-05-02-0055.Button,$Sum1205020055) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "โซดาสอยดาว" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "มะนาว น้ำเชื่อมบ๊วย น้ำเชื่อมลิ้นจี่ โซดา" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "WISHING TREE SODA" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Limenade, Ume Syrup, Lychee syrup & Ice" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-05-02-0055.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-05-02-0055.Button - StringFmt( $12-05-02-0055.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum1205020055 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $12-05-02-0055.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum1205020055 - text_unavailable - center-vertical-horizontal - - - ; - - - - ; ==================> Len = 11 - ; - 12-05-02-0056 - - - 33 - 22 - 225 - 296 - Flag( 12-05-02-0056.Button,$Sum1205020056) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "เป๊ปซี่ไอติมแท่ง" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "เป๊ปซี่ น้ำแดงกลิ่นสละ โซดา" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "BUCKET POPSICLE PEPSI" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Pepsi, Salak ryrup, soda" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-05-02-0056.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-05-02-0056.Button - StringFmt( $12-05-02-0056.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum1205020056 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $12-05-02-0056.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum1205020056 - text_unavailable - center-vertical-horizontal - ; - - - ; ==================> Len = 16 diff --git a/xml/page_catalog_group_recommend.skt b/xml/page_catalog_group_recommend.skt index a4113cc1..681ce228 100644 --- a/xml/page_catalog_group_recommend.skt +++ b/xml/page_catalog_group_recommend.skt @@ -16,6 +16,17 @@ Var Menu1Selected = "PressForever" + Var OreoBigButtonEnable = "Enable" + + If $12-01-01-0001.Button = "Invisible" Then + Var esp102101001Enable = "Invisible" + Var esp122101001Enable = "Enable" + + Else + Var esp102101001Enable = "Enable" + Var esp122101001Enable = "Invisible" + + EndIf SAVELOG PreviseXMLFileName2 @@ -64,7 +75,7 @@ - +;BigLogoLayout diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index 77f9ceb1..c232bca8 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -114,11 +114,21 @@ ; - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" Var Menu1Selected = "PressForever" + Var OreoBigButtonEnable = "Enable" + + If $12-01-01-0001.Button = "Invisible" Then + Var esp102101001Enable = "Invisible" + Var esp122101001Enable = "Enable" + + Else + Var esp102101001Enable = "Enable" + Var esp122101001Enable = "Invisible" + + EndIf SAVELOG PreviseXMLFileName2 @@ -329,7 +339,12 @@ If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + + If SongkranEnable = 1 Then + Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf EndIf @@ -563,7 +578,7 @@ testservice -; include-file=dummy_layout.inc +;dummy_layout.inc ; menu_new_list 44 ; ==================> Len = 16 ; 12-06-01-0001 - - @@ -1572,37 +1587,38 @@ Sugar Oreo" ; - - - - ; ==================> Len = 16 - ; 12-01-01-0001 - - + ;TAGESP + ; ==================> Len = 18 + ; กาแฟ (30 ml) Espresso (30 ml) 12-01-01-0001 33 22 225 296 - Flag( 12-01-01-0001.Button,Disable=Invisible,$Sum1201010001) + Flag( กาแฟ (30 ml).Button,Espresso (30 ml).Button,12-01-01-0001.Button,Disable=Invisible,$Sumกาแฟ (30 ml)Espresso (30 ml)1201010001) @@ -2918,508 +2933,7 @@ Sugar Oreo" center-vertical-horizontal - ; - - - - ; ==================> Len = 16 - ; 12-01-01-0001 - - - - 33 - 22 - 225 - 296 - Flag( 12-01-01-0001.Button,Disable=Invisible,$Sum1201010001) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "เอสเพรสโซ่" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "กาแฟ (30 ml)" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "ESPRESSO" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Espresso (30 ml)" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-01-01-0001.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-01-01-0001.Button - StringFmt( $12-01-01-0001.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum1201010001 = "Disable" Then - Var ice_tab_process_show = "Disable" - Else - Var ice_tab_process_show = "Enable" - EndIf - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum1201010001 = "Disable" Then - STRCONTAIN "ERR" $12-01-01-0001.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum1201010001 - text_unavailable - center-vertical-horizontal - - - ; 12-21-01-0001 - - - - 33 - 22 - 225 - 296 - Flag( 12-21-01-0001.Button,Disable=Invisible,$Sum1221010001) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "เอสเพรสโซ่" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "กาแฟ (30 ml)" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "ESPRESSO" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Espresso (30 ml)" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-21-01-0001.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-21-01-0001.Button - StringFmt( $12-21-01-0001.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 183 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sum1221010001 = "Disable" Then - Var ice_tab_process_show = "Disable" - Else - Var ice_tab_process_show = "Enable" - EndIf - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum1221010001 = "Disable" Then - STRCONTAIN "ERR" $12-21-01-0001.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum1221010001 - text_unavailable - center-vertical-horizontal - - + ; -;TAGESP ; ==================> Len = 16 ; 12-01-01-0003 12-01-02-0001 - @@ -13591,7 +13105,49 @@ LIMENADE SODA" + + + + Var BigButtonEnable = "Enable" + Refresh + + + Var BigButtonEnable = "Invisible" + Refresh + + - diff --git a/xml/page_catalog_group_songkran.xml b/xml/page_catalog_group_songkran.xml index 53673b06..ed23db8d 100644 --- a/xml/page_catalog_group_songkran.xml +++ b/xml/page_catalog_group_songkran.xml @@ -114,7 +114,6 @@ ; - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" @@ -319,7 +318,12 @@ If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + + If SongkranEnable = 1 Then + Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf EndIf diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml index e7b55466..6d0a7e8e 100644 --- a/xml/page_catalog_group_tea.xml +++ b/xml/page_catalog_group_tea.xml @@ -114,7 +114,6 @@ ; - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" Var Menu3Selected = "PressForever" @@ -323,7 +322,12 @@ If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + + If SongkranEnable = 1 Then + Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf EndIf @@ -526,7 +530,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 29 +; menu_new_list 27 ; ==================> Len = 11 ; 12-02-01-0001 12-02-02-0001 12-02-03-0001 @@ -7344,503 +7348,6 @@ Water" text_unavailable center-vertical-horizontal - - ; - - - - ; ==================> Len = 16 - ; - 12-02-02-0043 - - - 33 - 22 - 225 - 296 - Flag( 12-02-02-0043.Button,$Sum1202020043) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "ชาดำปาโป่ง" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "ชาไทย มะนาว โซดา" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "PAPONG TEA SODA" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Thai tea, Limenade,soda" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-02-02-0043.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-02-02-0043.Button - StringFmt( $12-02-02-0043.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum1202020043 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $12-02-02-0043.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum1202020043 - text_unavailable - center-vertical-horizontal - - - ; - - - - ; ==================> Len = 16 - ; - 12-02-02-0044 - - - 33 - 22 - 225 - 296 - Flag( 12-02-02-0044.Button,$Sum1202020044) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "ชาเขียวบ้านผีปอบ " - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "ชาเขียว น้ำเชื่อมสตรอเบอรี โซดา" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "MATCHA HAUNTED -HOUSE " - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Match, Strawberry Syrup,Soda" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $12-02-02-0044.Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-02-02-0044.Button - StringFmt( $12-02-02-0044.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - Var ice_tab_process_show = "Invisible" - - Else - Var ice_tab_process_show = "Invisible" - EndIf - Var return = ice_tab_process_show - ) - - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" - "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - - 49 - 117 - - eval( - If $Sum1202020044 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $12-02-02-0044.TAG tag2_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable - Var return = "Invisible" - If tag1_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag2_is_disable = "true" Then - Var return = "Enable" - EndIf - If tag3_is_disable = "true" Then - Var return = "Enable" - EndIf - Else - Var return = "Invisible" - EndIf - ) - - "ROOT/taobin_project/image//img_menu_err2.png" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum1202020044 - text_unavailable - center-vertical-horizontal - ; - - - diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml index 404e464b..29d5b1de 100644 --- a/xml/page_catalog_group_whey.xml +++ b/xml/page_catalog_group_whey.xml @@ -114,7 +114,6 @@ ; - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/eventopen_menu.ev" If AppFastEnable = "true" Then @@ -328,7 +327,12 @@ If ShowPromoitonOreo = 1 Then Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" Else - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + + If SongkranEnable = 1 Then + Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf EndIf