diff --git a/image/page_drink/Rectangle 51.png b/image/page_drink/Rectangle 51.png new file mode 100644 index 00000000..365357ab Binary files /dev/null and b/image/page_drink/Rectangle 51.png differ diff --git a/image/page_drink/bn_iced_pepsi.png b/image/page_drink/bn_iced_pepsi.png new file mode 100644 index 00000000..e93e413c Binary files /dev/null and b/image/page_drink/bn_iced_pepsi.png differ diff --git a/image/page_drink/bn_iced_pepsi_max.png b/image/page_drink/bn_iced_pepsi_max.png new file mode 100644 index 00000000..b802dbb8 Binary files /dev/null and b/image/page_drink/bn_iced_pepsi_max.png differ diff --git a/image/page_drink/bn_protein_isolated.png b/image/page_drink/bn_protein_isolated.png index 58dad4f4..dfe796a1 100644 Binary files a/image/page_drink/bn_protein_isolated.png and b/image/page_drink/bn_protein_isolated.png differ diff --git a/image/page_drink_press/bn_iced_pepsi.png b/image/page_drink_press/bn_iced_pepsi.png new file mode 100644 index 00000000..690611a5 Binary files /dev/null and b/image/page_drink_press/bn_iced_pepsi.png differ diff --git a/image/page_drink_press/bn_iced_pepsi_max.png b/image/page_drink_press/bn_iced_pepsi_max.png new file mode 100644 index 00000000..e05acb87 Binary files /dev/null and b/image/page_drink_press/bn_iced_pepsi_max.png differ diff --git a/image/page_lid_straw/img4.png b/image/page_lid_straw/img4.png new file mode 100644 index 00000000..e8a299c9 Binary files /dev/null and b/image/page_lid_straw/img4.png differ diff --git a/image/page_lid_straw_en/img4.png b/image/page_lid_straw_en/img4.png new file mode 100644 index 00000000..eee68c29 Binary files /dev/null and b/image/page_lid_straw_en/img4.png differ diff --git a/xml/menu_gen.py b/xml/menu_gen.py index f91b626c..835318eb 100644 --- a/xml/menu_gen.py +++ b/xml/menu_gen.py @@ -19,6 +19,7 @@ out_xml( '\t $' + product_code[i] + '.Button \r\n') out_xml( '\t + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-01-02-0008.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-01-02-0008.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-01-02-0008.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-01-02-0008.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-01-02-0008.descriptionE + + + ; button i=21 12-01-02-0009 + + 33 + 22 + 225 + 296 + $12-01-02-0009.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-01-02-0009.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-01-02-0009.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-01-02-0009.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-01-02-0009.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-01-02-0009.descriptionE diff --git a/xml/page_catalog_choose_drink3.pml b/xml/page_catalog_choose_drink3.pml index 3ababca8..35cf0839 100644 --- a/xml/page_catalog_choose_drink3.pml +++ b/xml/page_catalog_choose_drink3.pml @@ -5,32 +5,32 @@ product_code = [] - product_code.append('11-99-01-0017') - #product_code.append('11-99-01-0009') + product_code.append('12-02-01-0001') + product_code.append('12-02-01-0002') - product_code.append('11-99-01-0019') - product_code.append('11-99-01-0020') + product_code.append('12-02-01-0003') + product_code.append('12-02-01-0004') - #product_code.append('hot-black-tea') - product_code.append('11-99-01-0022') + product_code.append('12-02-01-0005') + product_code.append('12-02-01-0006') - product_code.append('11-99-01-0023') - product_code.append('11-99-01-0024') - product_code.append('11-99-01-0025') - product_code.append('11-99-01-0026') + product_code.append('12-02-01-0007') + product_code.append('12-02-01-0008') + product_code.append('12-02-01-0009') + product_code.append('12-02-01-0010') - product_code.append('11-99-02-0017') - product_code.append('11-99-02-0018') - product_code.append('11-99-02-0019') - product_code.append('11-99-02-0020') - #product_code.append('11-99-02-0021') - product_code.append('11-99-02-0022') - product_code.append('11-99-02-0023') + product_code.append('12-02-02-0001') + product_code.append('12-02-02-0002') + product_code.append('12-02-02-0003') + product_code.append('12-02-02-0004') + product_code.append('12-02-02-0005') + product_code.append('12-02-02-0006') + product_code.append('12-02-02-0007') - product_code.append('11-99-02-0024') - product_code.append('11-99-02-0025') - product_code.append('11-99-02-0026') + product_code.append('12-02-02-0008') + product_code.append('12-02-02-0009') + product_code.append('12-02-02-0010') menu_count = len( product_code) diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml index bbbcf9b9..94c61830 100644 --- a/xml/page_catalog_choose_drink3.xml +++ b/xml/page_catalog_choose_drink3.xml @@ -236,27 +236,28 @@ "auto" "Vertical" 4 - ; button i=1 11-99-01-0017 + ; button i=1 12-02-01-0001 33 22 225 296 - $11-99-01-0017.Button + $12-02-01-0001.Button + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-02-02-0008.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-02-02-0008.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-02-02-0008.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-02-02-0008.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-02-02-0008.descriptionE + + + ; button i=19 12-02-02-0009 + + 33 + 22 + 225 + 296 + $12-02-02-0009.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-02-02-0009.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-02-02-0009.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-02-02-0009.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-02-02-0009.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-02-02-0009.descriptionE + + + ; button i=20 12-02-02-0010 + + 33 + 22 + 225 + 296 + $12-02-02-0010.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-02-02-0010.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-02-02-0010.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-02-02-0010.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-02-02-0010.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-02-02-0010.descriptionE diff --git a/xml/page_catalog_choose_drink4.pml b/xml/page_catalog_choose_drink4.pml index 5a7141c8..9e367817 100644 --- a/xml/page_catalog_choose_drink4.pml +++ b/xml/page_catalog_choose_drink4.pml @@ -7,20 +7,20 @@ product_code = [] - product_code.append('11-99-01-0012') - product_code.append('11-99-01-0013') - product_code.append('11-99-01-0014') - product_code.append('11-99-01-0015') + product_code.append('12-03-01-0001') + product_code.append('12-03-01-0002') + product_code.append('12-03-01-0003') + product_code.append('12-03-01-0004') - product_code.append('11-99-01-0016') - product_code.append('11-99-02-0012') - product_code.append('11-99-02-0013') - product_code.append('11-99-02-0014') + product_code.append('12-03-01-0005') + product_code.append('12-03-02-0001') + product_code.append('12-03-02-0002') + product_code.append('12-03-02-0003') - product_code.append('11-99-02-0015') - product_code.append('11-99-03-0002') - product_code.append('11-99-02-0016') - #product_code.append('11-99-02-0013') + product_code.append('12-03-02-0004') + product_code.append('12-03-02-0006') + product_code.append('12-03-02-0005') + #product_code.append('12-03-02-0002') menu_count = len( product_code) diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml index 73cfdec1..40fc58df 100644 --- a/xml/page_catalog_choose_drink4.xml +++ b/xml/page_catalog_choose_drink4.xml @@ -237,27 +237,28 @@ "auto" "Vertical" 4 - ; button i=1 11-99-01-0012 + ; button i=1 12-03-01-0001 33 22 225 296 - $11-99-01-0012.Button + $12-03-01-0001.Button + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-04-02-0011.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-04-02-0011.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-04-02-0011.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-04-02-0011.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-04-02-0011.descriptionE diff --git a/xml/page_catalog_choose_drink8.xml b/xml/page_catalog_choose_drink8.xml index ea868c4d..c47666fd 100644 --- a/xml/page_catalog_choose_drink8.xml +++ b/xml/page_catalog_choose_drink8.xml @@ -246,6 +246,7 @@ 296 $11-99-05-0001.Button + +; + +;-END ; sugar layout @@ -265,7 +367,7 @@ 44 y_topping_bg BGSugar - "ROOT/taobin_project/image/topping/img1.png" + Var( DirImage + "/img_sugar.png" ) ; sugar1 @@ -376,7 +478,7 @@ Var SugarState3 = "Enable" Var SugarState4 = "Enable" Var SugarState5 = "PressForever" - Var topping1 = toppingID1index4 + Var topping1 = toppingID1index5 SAVELOG topping1 Refresh diff --git a/xml/page_topping_premix25percent_no.xml b/xml/page_topping_premix25percent_no.xml index fa6669f7..fdfbdbe7 100644 --- a/xml/page_topping_premix25percent_no.xml +++ b/xml/page_topping_premix25percent_no.xml @@ -68,15 +68,81 @@ CRLFToSpace showdesc ;SAVELOG showname - If RoadShow = "true" Then - Var PriceShowValue = "Free" + +;-BEGIN shot layout + Var backGroundAddExtra = DirImage + "/extra_img_1.png" + + If TOPPING2 = "shot coffee" Then + + Var backGroundAddExtra = DirImage + "/extra_img_1.png" + Var y_shot_coffee_bg = y2_topping_bg + Var y_shot_coffee_bt = y_shot_coffee_bg + 100 + Var ShotCoffeeBG = "Enable" + Var showShotEnable = "Enable" + ;Var ShotCoffeeBG = "Invisible" + ;Var showShotEnable = "Invisible" + Refresh EndIf +;-END + +;- Begin Price + Var PriceDrinkNoTop = PriceDrink + Var PriceDrinkTmp = PriceDrink + Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp + Var Timeout = 0 + + SAVELOG PriceDrinkTmp +;- End + + If RoadShow = "true" Then + Var PriceShowValue = "Free" + EndIf + 30000 Open "ROOT/taobin_project/xml/page_back_to_main.xml" + - 924 1804 @@ -253,9 +318,85 @@ 36 1080 0xFFFFFF - PriceShowValue + + + "OnValueChange" + + PriceDrinkTmpShow +;-BEGIN shot layout + + + 44 + y_shot_coffee_bg + ShotCoffeeBG + backGroundAddExtra + + +; + + +; + +;-END ; sugar layout @@ -263,7 +404,7 @@ 44 y_topping_bg BGSugar - "ROOT/taobin_project/image/topping/img1.png" + Var( DirImage + "/img_sugar.png" ) ; sugar1 diff --git a/xml/page_topping_with_barista.xml b/xml/page_topping_with_barista.xml index 1150060f..8eaf1e9d 100644 --- a/xml/page_topping_with_barista.xml +++ b/xml/page_topping_with_barista.xml @@ -17,11 +17,9 @@ Var SugarState4 = "Invisible" Var SugarState5 = "Invisible" - Var BGSubmenu = "Invisible" Var NormalMenu = "Invisible" Var BaristaMenu = "Invisible" - Var BGSubmenu = "Invisible" Var BaristaMenu = "Invisible" Var NormalMenu = "Invisible" @@ -42,15 +40,17 @@ ; Var y_sugar_block = 105 - Var y_block = 175 + 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 y_topping_bg = y2_topping_bg - Var y_topping = y2_topping - + + Var y_shot_coffee_bg = y2_topping_bg + Var y_shot_coffee_bt = y2_topping + 100 + Var BugFlag = 0 @@ -98,9 +98,34 @@ Var showname = NameDrinkTH Var showdesc = DrinkDescriptionTH EndIf - + CRLFToSpace showname +;-BEGIN shot layout + Var backGroundAddExtra = DirImage + "/extra_img_1.png" + + If TOPPING2 = "shot coffee" Then + + Var backGroundAddExtra = DirImage + "/extra_img_1.png" + Var y_shot_coffee_bg = y2_topping_bg + Var y_shot_coffee_bt = y_shot_coffee_bg + 100 + Var ShotCoffeeBG = "Enable" + Var showShotEnable = "Enable" + ;Var ShotCoffeeBG = "Invisible" + ;Var showShotEnable = "Invisible" + Refresh + EndIf +;-END + +;- Begin Price + Var PriceDrinkNoTop = PriceDrink + Var PriceDrinkTmp = PriceDrink + Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp + Var Timeout = 0 + + SAVELOG PriceDrinkTmp +;- End + If RoadShow = "true" Then Var PriceShowValue = "Free" EndIf @@ -111,6 +136,45 @@ Open "ROOT/taobin_project/xml/page_back_to_main.xml" + ; ; 0 @@ -127,12 +191,6 @@ "ROOT/taobin_project/video/taobin_adv2.mp4" - - 44 - 938 - BGSubmenu - "ROOT/taobin_project/image/topping/img2.png" - + +; + +;-END ; sugar layout @@ -342,7 +476,7 @@ 44 y_topping_bg BGSugar - "ROOT/taobin_project/image/topping/img1.png" + Var( DirImage + "/img_sugar.png" ) ; sugar1 diff --git a/xml/topview_button_back_main.xml b/xml/topview_button_back_main.xml index 80ef81a3..ff73e025 100644 --- a/xml/topview_button_back_main.xml +++ b/xml/topview_button_back_main.xml @@ -16,8 +16,8 @@ "/ROOT/sounds/click.wav" SoundVolume - TopView "hide" - OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml" + ;TopView "hide" + ;OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml"