diff --git a/image/page_doing/text_bottom_thai.png b/image/page_doing/text_bottom_thai.png index fe60ee14..a7a1f7aa 100644 Binary files a/image/page_doing/text_bottom_thai.png and b/image/page_doing/text_bottom_thai.png differ diff --git a/image/page_doing/text_bottom_thai2.png b/image/page_doing/text_bottom_thai2.png index 88d67622..c4919b29 100644 Binary files a/image/page_doing/text_bottom_thai2.png and b/image/page_doing/text_bottom_thai2.png differ diff --git a/xml/page_board.xml b/xml/page_board.xml index 9525ecd9..a1c52f71 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -12,7 +12,7 @@ Var sub_profile = "whey" - Var taobin_version = "1.03" + Var taobin_version = "1.04" ; 1.00 is ; On open diff --git a/xml/page_topping_alter.xml b/xml/page_topping_alter.xml index 315768a0..eaf1e21d 100644 --- a/xml/page_topping_alter.xml +++ b/xml/page_topping_alter.xml @@ -56,12 +56,22 @@ EndIf CRLFToSpace showname + CRLFToSpace showdesc + Var Timeout = 0 ;SAVELOG showname + Var ToppingGotoPayment = "true" + - 30000 + 2000 - Open "ROOT/taobin_project/xml/page_back_to_main.xml" + + Var Timeout = Timeout + 1 + + If Timeout > 10 Then + Var Timeout = 0 + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf @@ -96,7 +106,8 @@ Var showdesc = DrinkDescriptionTH EndIf CRLFToSpace showname - + CRLFToSpace showdesc + RefreshAll @@ -137,13 +148,14 @@ SAVELOG TOPPING1 SAVELOG MenuCodeName ;SAVELOG toppingID1Default - Var ToppingGotoPayment = "false" - + If BugFlag = 1 Then Else + If MenuCodeName = "barista1" Then Open "ROOT/taobin_project/xml/page_topping_with_barista.xml" + Var ToppingGotoPayment = "false" EndIf If TOPPING1 = "Powder Sugar" Then @@ -156,19 +168,34 @@ Var BugFlag = 1 Var topping1 = toppingID1Default + Var ToppingGotoPayment = "false" Refresh EndIf If TOPPING1 = "Powder Sugar Premix 25" Then + Var ToppingGotoPayment = "false" Open "ROOT/taobin_project/xml/page_topping_premix25percent.xml" EndIf If TOPPING1 = "Powder Sugar Premix 50" Then + Var ToppingGotoPayment = "false" Open "ROOT/taobin_project/xml/page_topping_premix50percent.xml" EndIf + If TOPPING1 = "Sugar" Then + Var ToppingGotoPayment = "false" + Open "ROOT/taobin_project/xml/page_topping_sugar_sufficiency.xml" + EndIf + If TOPPING1 = "Sugar Premix 25" Then + Var ToppingGotoPayment = "false" + Open "ROOT/taobin_project/xml/page_topping_premix25percent_no.xml" + EndIf + + + + SAVELOG ToppingGotoPayment If ToppingGotoPayment = "true" Then Topping "Select" SelectDrink ; Pack diff --git a/xml/page_topping_premix25percent.xml b/xml/page_topping_premix25percent.xml index fd43885f..3ec51354 100644 --- a/xml/page_topping_premix25percent.xml +++ b/xml/page_topping_premix25percent.xml @@ -65,6 +65,8 @@ EndIf CRLFToSpace showname + CRLFToSpace showdesc + ;SAVELOG showname @@ -294,7 +296,9 @@ Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "Enable" - Var topping1 = toppingID1index2 + Var topping1 = toppingID1index1 + SAVELOG topping1 + Refresh @@ -318,7 +322,9 @@ Var SugarState3 = "PressForever" Var SugarState4 = "Enable" Var SugarState5 = "Enable" - Var topping1 = toppingID1index3 + Var topping1 = toppingID1index2 + SAVELOG SugarState2 + SAVELOG topping1 Refresh @@ -341,8 +347,9 @@ Var SugarState3 = "Enable" Var SugarState4 = "PressForever" Var SugarState5 = "Enable" - Var topping1 = toppingID1index4 + Var topping1 = toppingID1index3 + SAVELOG topping1 Refresh @@ -365,7 +372,8 @@ Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "PressForever" - Var topping1 = toppingID1index5 + Var topping1 = toppingID1index4 + SAVELOG topping1 Refresh diff --git a/xml/page_topping_premix25percent_no.xml b/xml/page_topping_premix25percent_no.xml new file mode 100644 index 00000000..3e6a423a --- /dev/null +++ b/xml/page_topping_premix25percent_no.xml @@ -0,0 +1,384 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + ; On open + Var SugarState1 = "Invisible" + Var SugarState2 = "Invisible" + Var SugarState3 = "Invisible" + Var SugarState4 = "Invisible" + Var SugarState5 = "Invisible" + + ;Var SugarState1 = "Enable" + + + SAVELOG TOPPING1 + + SAVELOG toppingID1Default + Var topping1 = toppingID1Default + SAVELOG toppingID1index1 + SAVELOG toppingID1index2 + SAVELOG toppingID1index3 + SAVELOG toppingID1index4 + + SAVELOG TOPPING2 + SAVELOG TOPPING3 + SAVELOG TOPPING4 + + Var SugarState2 = "Enable" + Var SugarState3 = "Pressforever" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + Var BGSugar = "Enable" + + ;SAVELOG PreviseXMLFileName2 + + + Var y_sugar_block = 105 + Var y_block = 206 + + Var y_topping_bg = 912 + Var y_topping = 912 + y_sugar_block + + Var y2_topping_bg = y_topping_bg + y_block + Var y2_topping = y_topping + y_block + + Var BugFlag = 0 + + If show_eng = "true" Then + + Var DirImage = "ROOT/taobin_project/image/topping_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + Var showname = NameDrink + Var showdesc = DrinkDescription + + Else + Var DirImage = "ROOT/taobin_project/image/topping" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + Var showname = NameDrinkTH + Var showdesc = DrinkDescriptionTH + EndIf + + CRLFToSpace showname + CRLFToSpace showdesc + ;SAVELOG showname + + + 30000 + + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + + + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + +; back + + + + + + SAVELOG TOPPING1 + SAVELOG MenuCodeName + ;SAVELOG toppingID1Default + + If BugFlag = 1 Then + + Else + + + If RoadShow = "true" Then + Var PriceShowValue = "Free" + EndIf + + SAVELOG toppingID2price1 + SAVELOG toppingID2price2 + SAVELOG toppingID2price3 + EndIf + + + + + + + + + + 374 + 436 + 331 + 436 + PictureDrink + + + + 0 + 752 + 1080 + Center + 72 + KanitMediumTTF + 0x513C2F + showname + + + + 0 + 836 + 1080 + Center + 24 + KanitLightTTF + 0x6F5F51 + showdesc + + + +; back + + +; next + + + + + 924 + 1804 + KanitTTF + 36 + 1080 + 0xFFFFFF + PriceShowValue + + + + +; sugar layout + + 44 + y_topping_bg + BGSugar + "ROOT/taobin_project/image/topping/img1.png" + + +; sugar1 + + +; sugar2 + + + +; sugar3 + + +; sugar4 + + +; sugar5 + + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + diff --git a/xml/page_topping_premix50percent.xml b/xml/page_topping_premix50percent.xml index e32b8e96..e6aae865 100644 --- a/xml/page_topping_premix50percent.xml +++ b/xml/page_topping_premix50percent.xml @@ -28,8 +28,7 @@ SAVELOG TOPPING3 SAVELOG TOPPING4 - Var SugarState2 = "Pressforever" - Var SugarState3 = "Enable" + Var SugarState3 = "Pressforever" Var SugarState4 = "Enable" Var SugarState5 = "Enable" Var BGSugar = "Enable" diff --git a/xml/page_topping_sugar_sufficiency.xml b/xml/page_topping_sugar_sufficiency.xml new file mode 100644 index 00000000..37871b14 --- /dev/null +++ b/xml/page_topping_sugar_sufficiency.xml @@ -0,0 +1,368 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + ; On open + + Var SugarState1 = "Enable" + Var SugarState2 = "Enable" + Var SugarState3 = "PressForever" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + Var BGSugar = "Enable" + + SAVELOG TOPPING1 + SAVELOG TOPPING2 + SAVELOG TOPPING3 + SAVELOG TOPPING4 + + ;SAVELOG PreviseXMLFileName2 + + + Var y_sugar_block = 105 + Var y_block = 206 + + Var y_topping_bg = 912 + Var y_topping = 912 + y_sugar_block + + Var y2_topping_bg = y_topping_bg + y_block + Var y2_topping = y_topping + y_block + + Var topping1 = toppingID1Default + Var BugFlag = 0 + + If show_eng = "true" Then + + Var DirImage = "ROOT/taobin_project/image/topping_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + Var showname = NameDrink + Var showdesc = DrinkDescription + + Else + Var DirImage = "ROOT/taobin_project/image/topping" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + Var showname = NameDrinkTH + Var showdesc = DrinkDescriptionTH + EndIf + + SAVELOG toppingID1Default + + CRLFToSpace showname + CRLFToSpace showdesc + + ;SAVELOG showname + + + 30000 + + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + + + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + +; back + + + + + + SAVELOG TOPPING1 + SAVELOG MenuCodeName + SAVELOG toppingID1Default + Var ToppingGotoPayment = "false" + + If BugFlag = 1 Then + + Else + + + If RoadShow = "true" Then + Var PriceShowValue = "Free" + EndIf + + SAVELOG toppingID2price1 + SAVELOG toppingID2price2 + SAVELOG toppingID2price3 + EndIf + + + + + + + + + + 374 + 436 + 331 + 436 + PictureDrink + + + + 0 + 752 + 1080 + Center + 72 + KanitMediumTTF + 0x513C2F + showname + + + + 0 + 836 + 1080 + Center + 24 + KanitLightTTF + 0x6F5F51 + showdesc + + + +; back + + +; next + + + + + 924 + 1804 + KanitTTF + 36 + 1080 + 0xFFFFFF + PriceShowValue + + + + +; sugar layout + + 44 + y_topping_bg + BGSugar + Var( DirImage + "/img_sugar.png" ) + + +; sugar1 + + +; sugar2 + + + +; sugar3 + + +; sugar4 + + +; sugar5 + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + diff --git a/xml/vending_info.xml b/xml/vending_info.xml index f203fc59..7f2c6c65 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -51,6 +51,8 @@ Var ShowVersionAll = BrewMachineFirmwareVersion + " | " Var ShowVersionAll = ShowVersionAll + XMLPageVersion + Var ShowVersionAll = ShowVersionAll + " | " + Var ShowVersionAll = ShowVersionAll + taobin_version Var IDCardState = "Invisible"