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 00000000..4b41542f Binary files /dev/null and b/inter/mys/image/user_take_cup_en/bn_door_open.png differ 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 00000000..6cdca00d Binary files /dev/null and b/inter/mys/image/user_take_cup_en/bp_door_open.png differ diff --git a/inter/mys/menu/lang.tsv b/inter/mys/menu/lang.tsv index 65a5b07a..f5d4b981 100644 --- a/inter/mys/menu/lang.tsv +++ b/inter/mys/menu/lang.tsv @@ -157,7 +157,12 @@ TextID Note English Thai China Japan Malaysia 000407 Order next drink สั่งแก้วถัดไป Order next drink Font=Kanit,Type=Regular,Size=56,Color=0xDE794E,Align=Center Font=Kanit,Type=Regular,Size=56,Color=0xDE794E,Align=Center Font=Kanit,Type=Regular,Size=56,Color=0xDE794E,Align=Center 000408 Next customer can order while waiting ลูกค้าท่านถัดไปสั่งเครื่องดื่มรอได้เลย Next customer can order while waiting - + Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90 Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90 Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90 +000409 The Previous Drink\nHas Not Been Collected มีเครื่องดื่มค้างอยู่\nในช่องรับเครื่องดื่ม The Previous Drink\nHas Not Been Collected + Font=Roboto,Type=Regular,Size=36,Color=0x513C2F,Align=Center,LineHeight=50 Font=Roboto,Type=Regular,Size=43,Color=0x513C2F,Align=Center,LineHeight=40 Font=Roboto,Type=Regular,Size=36,Color=0x513C2F,Align=Center,LineHeight=50 +000410 Please press the button below to open the door.\nTake the drink out.\nAnd start odering your drink. กรุณกดปุ่มเปิดช่องรับเครื่องดื่ม\nนำเครื่องดื่มที่ค้างอยู่ออกจากช่อง\nก่อนเริ่มสั่งเครื่องดื่มของคุณ Please press the button below to open the door.\nTake the drink out.\nAnd start odering your drink. + Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50 Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50 Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50 +000411 Press Here กดที่นี่ Press Here diff --git a/inter/mys/xml/event/promotion_2.xml b/inter/mys/xml/event/promotion_2.xml index 1d853494..e78b6e99 100644 --- a/inter/mys/xml/event/promotion_2.xml +++ b/inter/mys/xml/event/promotion_2.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_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 +