From 20027017871c9313c560d6420f694230799d949e Mon Sep 17 00:00:00 2001 From: kong Date: Sat, 26 Dec 2020 01:33:30 +0700 Subject: [PATCH] Do --- image/page_drink/Rectangle 51.png | Bin 0 -> 1161 bytes image/page_drink/bn_iced_pepsi.png | Bin 0 -> 7603 bytes image/page_drink/bn_iced_pepsi_max.png | Bin 0 -> 8037 bytes image/page_drink/bn_protein_isolated.png | Bin 7470 -> 7466 bytes image/page_drink_press/bn_iced_pepsi.png | Bin 0 -> 7517 bytes image/page_drink_press/bn_iced_pepsi_max.png | Bin 0 -> 7954 bytes image/page_lid_straw/img4.png | Bin 0 -> 3558 bytes image/page_lid_straw_en/img4.png | Bin 0 -> 4202 bytes xml/menu_gen.py | 1 + xml/page_board.xml | 26 +- xml/page_catalog_choose_drink1.pml | 32 +- xml/page_catalog_choose_drink1.xml | 16 + xml/page_catalog_choose_drink2.pml | 43 +- xml/page_catalog_choose_drink2.xml | 849 +++++++++++------- xml/page_catalog_choose_drink3.pml | 40 +- xml/page_catalog_choose_drink3.xml | 871 +++++++++++++------ xml/page_catalog_choose_drink4.pml | 24 +- xml/page_catalog_choose_drink4.xml | 385 ++++---- xml/page_catalog_choose_drink5.pml | 14 +- xml/page_catalog_choose_drink5.xml | 245 +++--- xml/page_catalog_choose_drink6.pml | 43 +- xml/page_catalog_choose_drink6.xml | 735 ++++++++-------- xml/page_catalog_choose_drink7.pml | 22 +- xml/page_catalog_choose_drink7.xml | 442 ++++++---- xml/page_catalog_choose_drink8.xml | 10 + xml/page_drinkok.xml | 2 +- xml/page_lid_straw.xml | 20 +- xml/page_payment_cash.xml | 4 +- xml/page_topping_alter.xml | 24 +- xml/page_topping_premix25percent.xml | 108 ++- xml/page_topping_premix25percent_no.xml | 151 +++- xml/page_topping_with_barista.xml | 166 +++- xml/topview_button_back_main.xml | 4 +- 33 files changed, 2677 insertions(+), 1600 deletions(-) create mode 100644 image/page_drink/Rectangle 51.png create mode 100644 image/page_drink/bn_iced_pepsi.png create mode 100644 image/page_drink/bn_iced_pepsi_max.png create mode 100644 image/page_drink_press/bn_iced_pepsi.png create mode 100644 image/page_drink_press/bn_iced_pepsi_max.png create mode 100644 image/page_lid_straw/img4.png create mode 100644 image/page_lid_straw_en/img4.png diff --git a/image/page_drink/Rectangle 51.png b/image/page_drink/Rectangle 51.png new file mode 100644 index 0000000000000000000000000000000000000000..365357ab93fe1bbc0f64840b90e249d69e9069d3 GIT binary patch literal 1161 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b802dbb8f761816dfcbdaed9a84325ae9c6e312b GIT binary patch literal 8037 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 BJ=*{P literal 0 HcmV?d00001 diff --git a/image/page_drink/bn_protein_isolated.png b/image/page_drink/bn_protein_isolated.png index 58dad4f49c84f174bdabc74ee0a1df374391bd19..dfe796a10bb807a6a0842bac5a2a8f8e3f096e04 100644 GIT binary patch delta 6909 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 z zh%>p(&S$a6%A%hoIgNX+&11f0} A761SM delta 6913 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 literal 0 HcmV?d00001 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"