From 0edd2c082757bd9a4b7cf6cfe329b89175fd6dd7 Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Tue, 17 Oct 2023 10:19:27 +0700 Subject: [PATCH] update remove cup inter --- inter/aus/menu/lang.tsv | 8 +- inter/aus/xml/page_remove_cup.lxml | 156 ++++++++++++++++++ .../image/user_take_cup_en/bn_door_open.png | Bin .../image/user_take_cup_en/bp_door_open.png | Bin inter/mys/menu/lang.tsv | 17 +- inter/mys/xml/page_remove_cup.lxml | 19 +-- xml/page_remove_cup.xml | 3 +- 7 files changed, 177 insertions(+), 26 deletions(-) create mode 100644 inter/aus/xml/page_remove_cup.lxml rename inter/{mys => common}/image/user_take_cup_en/bn_door_open.png (100%) rename inter/{mys => common}/image/user_take_cup_en/bp_door_open.png (100%) diff --git a/inter/aus/menu/lang.tsv b/inter/aus/menu/lang.tsv index c9f5962d..81aa3c7d 100644 --- a/inter/aus/menu/lang.tsv +++ b/inter/aus/menu/lang.tsv @@ -157,8 +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 img_active="ROOT/taobin_project/mage,img_press=,img_deactive= img_active="ROOT/taobin_project/mage,img_press=,img_deactive= diff --git a/inter/aus/xml/page_remove_cup.lxml b/inter/aus/xml/page_remove_cup.lxml new file mode 100644 index 00000000..74c4d693 --- /dev/null +++ b/inter/aus/xml/page_remove_cup.lxml @@ -0,0 +1,156 @@ + + 0 + 608 + "Enable" + 1080 + 1312 + "0xEFEDEA" + SoundVolume + + Var countClick = 0 + Var countClick2 = 0 + + Var CountryName = "Australia" + + DEBUGVAR "AUS Remove Cup" + + Var DirImage = "ROOT/taobin_project/inter/common/image/user_take_cup_en/" + + 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.lxml" + 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/inter/mys/image/user_take_cup_en/bn_door_open.png b/inter/common/image/user_take_cup_en/bn_door_open.png similarity index 100% rename from inter/mys/image/user_take_cup_en/bn_door_open.png rename to inter/common/image/user_take_cup_en/bn_door_open.png diff --git a/inter/mys/image/user_take_cup_en/bp_door_open.png b/inter/common/image/user_take_cup_en/bp_door_open.png similarity index 100% rename from inter/mys/image/user_take_cup_en/bp_door_open.png rename to inter/common/image/user_take_cup_en/bp_door_open.png diff --git a/inter/mys/menu/lang.tsv b/inter/mys/menu/lang.tsv index 0dc3b380..f5d4b981 100644 --- a/inter/mys/menu/lang.tsv +++ b/inter/mys/menu/lang.tsv @@ -52,11 +52,11 @@ TextID Note English Thai China Japan Malaysia Font=Kanit,Type=Regular,Size=14,Color=0xEEEEEE,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0xEEEEEE,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0xEEEEEE,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0xCFCFCF,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0xCFCFCF,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0xCFCFCF,Align=Center 000046 0% 0% 0% -000047 30% 30% 20% -000048 60% 60% 40% -000049 100% 100% 60% -000050 120% 120% 80% -000051 140% 140% 100% +000047 20% 20% 20% +000048 40% 40% 40% +000049 60% 60% 60% +000050 80% 80% 80% +000051 100% 100% 100% Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Bold,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Bold,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Bold,Size=24,Color=0x513C2F,Align=Center 000052 No added sugar ไม่ใส่น้ำตาล No added sugar @@ -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/page_remove_cup.lxml b/inter/mys/xml/page_remove_cup.lxml index 5a9a001d..d13ffeb7 100644 --- a/inter/mys/xml/page_remove_cup.lxml +++ b/inter/mys/xml/page_remove_cup.lxml @@ -7,15 +7,14 @@ "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" + DEBUGVAR "MALAY Remove Cup" + + Var DirImage = "ROOT/taobin_project/inter/common/image/user_take_cup_en/" LED LedDoorDoor 5 255 255 255 255 @@ -36,18 +35,6 @@ Open "ROOT/taobin_project/xml/page_show_error.lxml" 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 ; diff --git a/xml/page_remove_cup.xml b/xml/page_remove_cup.xml index eeef43b5..d491546c 100644 --- a/xml/page_remove_cup.xml +++ b/xml/page_remove_cup.xml @@ -18,8 +18,7 @@ EndIf If StrCountryShort = "AUS" Then - Var CountryName = "Australia" - Var show_eng = "true" + Open "ROOT/taobin_project/inter/aus/xml/page_remove_cup.lxml" EndIf