diff --git a/image/page_drink_n/bn_thai_black_tea_SingPark_Healthy.png b/image/page_drink_n/bn_thai_black_tea_SingPark_Healthy.png index 269bbae4..edfee7fd 100644 Binary files a/image/page_drink_n/bn_thai_black_tea_SingPark_Healthy.png and b/image/page_drink_n/bn_thai_black_tea_SingPark_Healthy.png differ diff --git a/image/topping/bd_next.png b/image/topping/bd_next.png new file mode 100644 index 00000000..8cea86b9 Binary files /dev/null and b/image/topping/bd_next.png differ diff --git a/image/topping2/bd_next.png b/image/topping2/bd_next.png new file mode 100644 index 00000000..8c87b35b Binary files /dev/null and b/image/topping2/bd_next.png differ diff --git a/image/topping2/bg_milk_choice.png b/image/topping2/bg_milk_choice.png new file mode 100644 index 00000000..9bae1726 Binary files /dev/null and b/image/topping2/bg_milk_choice.png differ diff --git a/image/topping2/bg_top_milk.png b/image/topping2/bg_top_milk.png new file mode 100644 index 00000000..f0ee9b16 Binary files /dev/null and b/image/topping2/bg_top_milk.png differ diff --git a/image/topping2/bn_cereal.png b/image/topping2/bn_cereal.png new file mode 100644 index 00000000..0ecd325c Binary files /dev/null and b/image/topping2/bn_cereal.png differ diff --git a/image/topping2/bp_cereal.png b/image/topping2/bp_cereal.png new file mode 100644 index 00000000..1b95001d Binary files /dev/null and b/image/topping2/bp_cereal.png differ diff --git a/image/topping2/please_wait.png b/image/topping2/please_wait.png new file mode 100644 index 00000000..e7679bce Binary files /dev/null and b/image/topping2/please_wait.png differ diff --git a/image/topping2_en/please_wait.png b/image/topping2_en/please_wait.png new file mode 100644 index 00000000..23d18f87 Binary files /dev/null and b/image/topping2_en/please_wait.png differ diff --git a/image/topping2_en/topping2/bg_top_milk.png b/image/topping2_en/topping2/bg_top_milk.png new file mode 100644 index 00000000..4fbd7ce3 Binary files /dev/null and b/image/topping2_en/topping2/bg_top_milk.png differ diff --git a/ui/lang.tsv b/ui/lang.tsv index 85e976b8..0dc3b380 100644 --- a/ui/lang.tsv +++ b/ui/lang.tsv @@ -647,6 +647,7 @@ TextID Note English Thai China Japan Malaysia 800515 Current version เวอร์ชันปัจจุบัน 800516 Last version เวอร์ชันล่าสุด 800517 Upgrade status สถานะอัพเกรด +800518 Select file เลือกไฟล์ 800600 Turn around หมุนกลับ 800601 Call arm Call แขน @@ -656,4 +657,12 @@ TextID Note English Thai China Japan Malaysia 800605 200g place at ARM and press Yes. นำ 200g วางที่แขน แล้วกด ใช่ 800606 800607 -800608 +800608 Bean tray no close ถาดเมล็ดกาแฟปิดไม่สนิท +800609 Door cash not close. ประตูเก็บเงินเปิด +800610 Powder and arm not close. ชุดแขน (ผง แก้ว) ปิดไม่สนิท +800611 Coffee ground is full. กากกาแฟเต็ม +800612 Waste water full น้ำทิ้งเต็ม +800613 Main Gate still open. ประตูตู้เปิด +800614 +800615 LID 1 disable ฝาช่องที่ 1 ปิด +800616 LID 2 disable ฝาช่องที่ 2 ปิด diff --git a/xml/event/tricker.ev b/xml/event/tricker.ev index 4843c87d..00afd4d6 100644 --- a/xml/event/tricker.ev +++ b/xml/event/tricker.ev @@ -84,6 +84,13 @@ If BoxID = 200000 Then Var PepsiProCodeEnable = 0 EndIf +If BoxID = 173149 Then + Var OreoDueEnable = 0 + Var OreoForFreeEnable = 0 + Var PepsiProEnable = 0 + Var PepsiProCodeEnable = 0 +EndIf + If BoxID = 172053 Then Var PepsiProEnable = 1 EndIf diff --git a/xml/page_board.xml b/xml/page_board.xml index 005ed075..5fcb3512 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -43,7 +43,6 @@ Var web_readyOK = "false" Var GetFreeFromError = 0 - Var taobin_version = "1.00" Cart "DeleteMenuID" "ALL" @@ -114,8 +113,28 @@ EndIf - If MachineStage = "close-maintenance" Then - Open "ROOT/taobin_project/xml/page_show_error.xml" + If BoxID = 200001 Then + Var NoWaitMachineEnable = 1 + EndIf + If BoxID = 173149 Then + Var NoWaitMachineEnable = 1 + EndIf + If BoxID = 172527 Then + Var NoWaitMachineEnable = 1 + EndIf + + + If NoWaitMachineEnable = 1 Then + If stop_now = "true" Then + Open "ROOT/taobin_project/xml/page_show_error.xml" + EndIf + + Else + + If MachineStage = "close-maintenance" Then + Open "ROOT/taobin_project/xml/page_show_error.xml" + + EndIf EndIf @@ -128,8 +147,6 @@ Open "ROOT/taobin_project/xml/page_show_error.xml" EndIf - - Var TestLoopMakeDrink = 0 @@ -836,8 +853,9 @@ - Var SongkranEnable = 0 + Var NoWaitMachineEnable = 1 + Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml" @@ -863,6 +881,10 @@ Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" + + Var NoWaitMachineEnable = 0 + + 1000 If IgnoreNetCore = "true" Then @@ -876,11 +898,17 @@ Open "/ROOT/xml/offline.xml" EndIf - If MachineStage = "close-maintenance" Then - Open "ROOT/taobin_project/xml/page_show_error.xml" + If NoWaitMachineEnable = 1 Then + If stop_now = "true" Then + Open "ROOT/taobin_project/xml/page_show_error.xml" + EndIf + Else + If MachineStage = "close-maintenance" Then + Open "ROOT/taobin_project/xml/page_show_error.xml" + EndIf EndIf - + If MachineStage = "mcu-upgrade" Then Open "ROOT/taobin_project/xml/page_show_error.xml" diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml index 502b6f8b..2bfd31c8 100644 --- a/xml/page_topping_select6.xml +++ b/xml/page_topping_select6.xml @@ -11,6 +11,13 @@ SAVELOG "Event Open Select 6" + If NoWaitMachineEnable = 1 Then + Var ConfirmDrinkButtonState = "Enable" + Else + + Var ConfirmDrinkButtonState = "Invisible" + EndIf + Var y_topping_bg = 912 Var CHECK_EventOpen_Double = CHECK_EventOpen_Double + 1 @@ -78,6 +85,8 @@ ;Var ShotCoffeePremium = "Enable" ;Var showOreoAddEnable = "Enable" + Var CerealMilkToppingEnable = "Invisible" + Var ExtraTopping = "Invisible" ; On open @@ -374,6 +383,26 @@ EndIf EndIf + + + If NoWaitMachineEnable = 1 Then + DEBUGVAR MachineStage + DEBUGVAR ConfirmDrinkButtonState + If MachineStage = "close-maintenance" Then + Var ConfirmDrinkButtonState = "Enable" + + If stop_now = "true" Then + Open "ROOT/taobin_project/xml/page_show_error.xml" + EndIf + Else + Var ConfirmDrinkButtonState = "Invisible" + EndIf + Else + + + + EndIf + Refresh TimerReset @@ -1364,6 +1393,10 @@ EndIf ;topping_price_refresh = 0 + If MenuCodeName1 = "Cereal-Milk" Then + Var CerealMilkToppingEnable = "Enable" + EndIf + SAVELOG ToppingGotoPayment If ToppingGotoPayment = "true" Then @@ -1485,11 +1518,13 @@ ; ; ;- FRAME SCORELLL +; zone scroll 52 881 1080 - "auto-all" + 900 +; "auto-all" "Vertical" 1 @@ -1700,6 +1735,9 @@ + +;-END + ; ; ; @@ -2653,6 +2691,153 @@ ; ; +; +; +; +; +; +; +; +; +; +; +;-BEGIN +; +;-BEGIN Lid straw + + 986 + 240 + 20 + ShowLidStraw + + bg_strawlid + + +; straw left + + + + + + +; LID left + + + + + + StrawDeactiveButton + 602 + 64 + Var( DirImage + "/text20.png" ) + + + + + LidDeactiveButton + 602 + 150 + Var( DirImage + "/text21.png" ) + + + + ;-END ; ; @@ -2684,6 +2869,85 @@ Var( DirImage + "/bg_top.png" ) + +; +; +; + + 986 + "auto" + CerealMilkToppingEnable +; + + 0 + 0 + Var( DirImage + "/bg_top_milk.png") + + + + +; + + + + topping_shot_price_x + 2 + KanitRegularTTF + "ShotCoffeePremium" + 36 + 0x84776F + text_price_topping + + + ; ; ; @@ -2984,8 +3248,14 @@ +; +; +; +; +; +; +; -;-END ; ; ; @@ -2996,7 +3266,7 @@ ; ; ; -;-BEGIN Collagen +;-BEGIN ; ;-BEGIN Lid straw @@ -4048,6 +4318,16 @@ +; next2 button Protect + ; zone diff --git a/xml/vending_info.xml b/xml/vending_info.xml index 2f3f8697..1a6495ad 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -74,9 +74,6 @@ Var ShowVersionAll = BrewMachineFirmwareVersion + " | " Var ShowVersionAll = ShowVersionAll + XMLPageVersion - Var ShowVersionAll = ShowVersionAll + " | " - Var ShowVersionAll = ShowVersionAll + taobin_version - Var ShowVersionAll = ShowVersionAll + " | " Var ShowVersionAll = ShowVersionAll + JXMLVersion diff --git a/xml_main/startup.xml b/xml_main/startup.xml index a9e846fd..8a78b699 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "7.33" - Var XMLPageVersionInt = 733 + Var XMLPageVersion = "7.34" + Var XMLPageVersionInt = 734