From 6ff4dd8728be9632cd69e40069bdd0ef6db57ab3 Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Mon, 9 Oct 2023 13:30:00 +0700 Subject: [PATCH] add malay custom remove cup page --- .../image/user_take_cup_en/bn_door_open.png | Bin 0 -> 3375 bytes .../image/user_take_cup_en/bp_door_open.png | Bin 0 -> 3370 bytes inter/mys/menu/lang.tsv | 7 +- inter/mys/xml/event/promotion_2.xml | 20 +- inter/mys/xml/event/promotion_3.xml | 20 +- inter/mys/xml/event/promotion_pepsi_099.lxml | 20 +- inter/mys/xml/page_catalog_group_other.lxml | 274 +++++++++++++++++- .../mys/xml/page_catalog_group_recommend.lxml | 20 +- inter/mys/xml/page_remove_cup.lxml | 170 +++++++++++ xml/page_remove_cup.xml | 5 +- 10 files changed, 488 insertions(+), 48 deletions(-) create mode 100644 inter/mys/image/user_take_cup_en/bn_door_open.png create mode 100644 inter/mys/image/user_take_cup_en/bp_door_open.png create mode 100644 inter/mys/xml/page_remove_cup.lxml diff --git a/inter/mys/image/user_take_cup_en/bn_door_open.png b/inter/mys/image/user_take_cup_en/bn_door_open.png new file mode 100644 index 0000000000000000000000000000000000000000..4b41542fcf391b497479a2fe47545916001d8f22 GIT binary patch literal 3375 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 literal 0 HcmV?d00001 diff --git a/inter/mys/image/user_take_cup_en/bp_door_open.png b/inter/mys/image/user_take_cup_en/bp_door_open.png new file mode 100644 index 0000000000000000000000000000000000000000..6cdca00d0e6a4ea6c2813d6b0bb8824cbd45730d GIT binary patch literal 3370 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 i@%3c-HR6d6Ves1 KanitMediumTTF 0x322B26 - PEPSI + PEPSI Black เป็ปซี่น้ำแข็ง - PEPSI + PEPSI Black เป็ปซี่น้ำแข็ง - PEPSI + PEPSI Black เป็ปซี่น้ำแข็ง @@ -11573,11 +11573,11 @@ KanitMediumTTF 0x6F5F51 - Pepsi, Ice + Pepsi Black, Ice เป๊ปซี่ - Pepsi, Ice + Pepsi Black, Ice เป๊ปซี่ - Pepsi, Ais + Pepsi Black, Ais เป๊ปซี่ diff --git a/inter/mys/xml/event/promotion_3.xml b/inter/mys/xml/event/promotion_3.xml index 92648619..612dedfd 100644 --- a/inter/mys/xml/event/promotion_3.xml +++ b/inter/mys/xml/event/promotion_3.xml @@ -11470,16 +11470,16 @@ Var PD_CODE2 = "12-05-02-0062" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "PEPSI" - Var aliasDesc[0] = "Pepsi, Ice" + Var aliasName[0] = "PEPSI Black" + Var aliasDesc[0] = "Pepsi Black, Ice" Var aliasName[1] = "เป็ปซี่น้ำแข็ง" Var aliasDesc[1] = "เป๊ปซี่" Var aliasName[2] = "-" Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "PEPSI" - Var aliasDesc[4] = "Pepsi, Ais" + Var aliasName[4] = "PEPSI Black" + Var aliasDesc[4] = "Pepsi Black, Ais" Var NameLang[0][0] = "" Var NameLang[0][1] = "" Var NameLang[0][2] = "" @@ -11557,11 +11557,11 @@ KanitMediumTTF 0x322B26 - PEPSI + PEPSI Black เป็ปซี่น้ำแข็ง - PEPSI + PEPSI Black เป็ปซี่น้ำแข็ง - PEPSI + PEPSI Black เป็ปซี่น้ำแข็ง @@ -11573,11 +11573,11 @@ KanitMediumTTF 0x6F5F51 - Pepsi, Ice + Pepsi Black, Ice เป๊ปซี่ - Pepsi, Ice + Pepsi Black, Ice เป๊ปซี่ - Pepsi, Ais + Pepsi Black, Ais เป๊ปซี่ diff --git a/inter/mys/xml/event/promotion_pepsi_099.lxml b/inter/mys/xml/event/promotion_pepsi_099.lxml index a0c764f6..4c68f6b8 100644 --- a/inter/mys/xml/event/promotion_pepsi_099.lxml +++ b/inter/mys/xml/event/promotion_pepsi_099.lxml @@ -11470,16 +11470,16 @@ Var PD_CODE2 = "12-05-02-0062" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "PEPSI" - Var aliasDesc[0] = "Pepsi, Ice" + Var aliasName[0] = "PEPSI Black" + Var aliasDesc[0] = "Pepsi Black, Ice" Var aliasName[1] = "เป็ปซี่น้ำแข็ง" Var aliasDesc[1] = "เป๊ปซี่" Var aliasName[2] = "-" Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "PEPSI" - Var aliasDesc[4] = "Pepsi, Ais" + Var aliasName[4] = "PEPSI Black" + Var aliasDesc[4] = "Pepsi Black, Ais" Var NameLang[0][0] = "" Var NameLang[0][1] = "" Var NameLang[0][2] = "" @@ -11557,11 +11557,11 @@ KanitMediumTTF 0x322B26 - PEPSI + PEPSI Black เป็ปซี่น้ำแข็ง - PEPSI + PEPSI Black เป็ปซี่น้ำแข็ง - PEPSI + PEPSI Black เป็ปซี่น้ำแข็ง @@ -11573,11 +11573,11 @@ KanitMediumTTF 0x6F5F51 - Pepsi, Ice + Pepsi Black, Ice เป๊ปซี่ - Pepsi, Ice + Pepsi Black, Ice เป๊ปซี่ - Pepsi, Ais + Pepsi Black, Ais เป๊ปซี่ diff --git a/inter/mys/xml/page_catalog_group_other.lxml b/inter/mys/xml/page_catalog_group_other.lxml index a98af53f..91bfd63f 100644 --- a/inter/mys/xml/page_catalog_group_other.lxml +++ b/inter/mys/xml/page_catalog_group_other.lxml @@ -927,8 +927,8 @@ Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "PEPSI" - Var aliasDesc[4] = "Pepsi, Ais" + Var aliasName[4] = "PEPSI Black" + Var aliasDesc[4] = "Pepsi Black, Ais" Var NameLang[0][0] = "" Var NameLang[0][1] = "" Var NameLang[0][2] = "" @@ -1010,7 +1010,7 @@ เป็ปซี่น้ำแข็ง PEPSI Black เป็ปซี่น้ำแข็ง - PEPSI + PEPSI Black เป็ปซี่น้ำแข็ง @@ -1026,7 +1026,7 @@ เป๊ปซี่ Pepsi Black, Ice เป๊ปซี่ - Pepsi, Ais + Pepsi Black, Ais เป๊ปซี่ @@ -9281,6 +9281,272 @@ center-vertical-horizontal + + ; ==================> Len = 3 + ; 12-05-01-0001 12-05-02-0001 12-05-03-0001 + + 33 + 22 + 225 + 296 + Flag( 12-05-01-0001.Button,12-05-02-0001.Button,12-05-03-0001.Button,$Sum120501000112050200011205030001) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + LIMENADE + น้ำมะนาว + LIMENADE + น้ำมะนาว + LIMAU AIS + น้ำมะนาว + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Limenade, Sugar + น้ำมะนาว น้ำตาล + Limenade, Sugar + น้ำมะนาว น้ำตาล + Sirap Limau, Gula, Ais + น้ำมะนาว น้ำตาล + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + $12-05-01-0001.Button + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-01-0001.Button + StringFmt( $12-05-01-0001.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0001.Button + + + 113 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0001.Button + StringFmt( $12-05-02-0001.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-05-03-0001.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-03-0001.Button + StringFmt( $12-05-03-0001.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + If $Sum120501000112050200011205030001 = "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 $Sum120501000112050200011205030001 = "Disable" Then + STRCONTAIN "ERR" $12-05-01-0001.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0001.TAG tag2_is_disable + STRCONTAIN "ERR" $12-05-03-0001.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 + "disable-show" + $Sum120501000112050200011205030001 + + 000013 + + center-vertical-horizontal + ; ==================> Len = 3 ; - 12-05-02-0026 12-05-03-0026 diff --git a/inter/mys/xml/page_catalog_group_recommend.lxml b/inter/mys/xml/page_catalog_group_recommend.lxml index 673d0f24..0ec76c7c 100644 --- a/inter/mys/xml/page_catalog_group_recommend.lxml +++ b/inter/mys/xml/page_catalog_group_recommend.lxml @@ -10759,16 +10759,16 @@ Var PD_CODE2 = "12-05-02-0062" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "PEPSI" - Var aliasDesc[0] = "Pepsi, Ice" + Var aliasName[0] = "PEPSI Black" + Var aliasDesc[0] = "Pepsi Black, Ice" Var aliasName[1] = "เป็ปซี่น้ำแข็ง" Var aliasDesc[1] = "เป๊ปซี่" Var aliasName[2] = "-" Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "PEPSI" - Var aliasDesc[4] = "Pepsi, Ais" + Var aliasName[4] = "PEPSI Black" + Var aliasDesc[4] = "Pepsi Black, Ais" Var NameLang[0][0] = "" Var NameLang[0][1] = "" Var NameLang[0][2] = "" @@ -10846,11 +10846,11 @@ KanitMediumTTF 0x322B26 - PEPSI + PEPSI Black เป็ปซี่น้ำแข็ง - PEPSI + PEPSI Black เป็ปซี่น้ำแข็ง - PEPSI + PEPSI Black เป็ปซี่น้ำแข็ง @@ -10862,11 +10862,11 @@ KanitMediumTTF 0x6F5F51 - Pepsi, Ice + Pepsi Black, Ice เป๊ปซี่ - Pepsi, Ice + Pepsi Black, Ice เป๊ปซี่ - Pepsi, Ais + Pepsi Black, Ais เป๊ปซี่ diff --git a/inter/mys/xml/page_remove_cup.lxml b/inter/mys/xml/page_remove_cup.lxml new file mode 100644 index 00000000..8fb7233d --- /dev/null +++ b/inter/mys/xml/page_remove_cup.lxml @@ -0,0 +1,170 @@ + + 0 + 608 + "Enable" + 1080 + 1312 + "0xEFEDEA" + SoundVolume + + Var Timeout = 0 + Var countClick = 0 + Var countClick2 = 0 + + Var CountryName = "Malaysia" + + Var DirImage = "ROOT/taobin_project/inter/mys/image/user_take_cup_en/" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + + LED LedDoorDoor 5 255 255 255 255 + + + + 2000 + + ;SAVELOG MachineErrorDetail + Var MachineErrorDetailAll = MachineErrorDetail + " / " + Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng + + + If MachineStage = "show-menu" Then + Open "ROOT/taobin_project/xml/page_board.xml" + + EndIf + If MachineStage = "close-maintenance" Then + Open "ROOT/taobin_project/xml/page_show_error.xml" + + EndIf + + If Timeout = 0 Then + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" + EndIf + + Var Timeout = Timeout + 1 + + If Timeout > 15 Then + Var Timeout = 0 + + + EndIf + + ; Logic have differrent drinkfail3.xml + ; protect lock + ; + + If CheckCupStateDoorCupCloseCnt > 0 Then + Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1 + EndIf + + If CheckCupStateDoorCupCloseCnt = 0 Then + Var CheckCupStateDoorCupClose = "" + EndIf + + If HaveCup = "true" Then + + If CheckCupStateDoorCupClose = "" Then + Var buttonRemoveCup = "Enable" + EndIf + + If CheckCupStateDoorCupClose = "done" Then + Var buttonRemoveCup = "Enable" + EndIf + Else + If buttonRemoveCup = "Enable" Then + Var buttonRemoveCup = "Invisible" + EndIf + EndIf + + Refresh + TimerReset + + + + + + 50 + 852 + 1000 + 300 + + 000409 + + + + + 50 + 1200 + 1000 + 200 + + 000410 + + + + + + + + + + + + + + + + + 5 + 1868 + 24 + Center + 1080 + RobotoRegular + 0xDE794E + MachineErrorDetailAll + + + + diff --git a/xml/page_remove_cup.xml b/xml/page_remove_cup.xml index 3856939f..eeef43b5 100644 --- a/xml/page_remove_cup.xml +++ b/xml/page_remove_cup.xml @@ -14,8 +14,7 @@ READ_FILE "/mnt/sdcard/coffeevending/country/short" StrCountryShort DEBUGVAR StrCountryShort If StrCountryShort = "MYS" Then - Var CountryName = "Malaysia" - Var show_eng = "true" + Open "ROOT/taobin_project/inter/mys/xml/page_remove_cup.lxml" EndIf If StrCountryShort = "AUS" Then @@ -165,4 +164,4 @@ - \ No newline at end of file +