From 3496cedf60ca213c5590417135fa68966236b5fb Mon Sep 17 00:00:00 2001 From: kong Date: Wed, 8 Feb 2023 13:57:47 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=81=E0=B9=89=E0=B8=B2=E0=B8=A7=E0=B8=81?= =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B9=82=E0=B8=94=E0=B8=94=20=E0=B8=9E?= =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xml/menu_new_layout_gen_v2.py | 5 +- xml/page_catalog.lxml | 5 +- xml/page_catalog_group_appfast.lxml | 5 + xml/page_catalog_group_cocktail.lxml | 14 ++ xml/page_catalog_group_coffee.lxml | 45 +++++ xml/page_catalog_group_forkid.lxml | 14 ++ xml/page_catalog_group_health.lxml | 17 ++ xml/page_catalog_group_milk.lxml | 15 ++ xml/page_catalog_group_other.lxml | 35 ++++ xml/page_catalog_group_recommend.lxml | 38 +++++ xml/page_catalog_group_recommend.xml | 4 +- xml/page_catalog_group_tea.lxml | 27 +++ xml/page_catalog_group_whey.lxml | 15 ++ xml/page_topping_select6.lxml | 230 ++++++++++++++++++++++---- 14 files changed, 428 insertions(+), 41 deletions(-) diff --git a/xml/menu_new_layout_gen_v2.py b/xml/menu_new_layout_gen_v2.py index c1d2ebda..20596c5f 100644 --- a/xml/menu_new_layout_gen_v2.py +++ b/xml/menu_new_layout_gen_v2.py @@ -9,6 +9,9 @@ idx_hot_product_code = 5 idx_cold_product_code = 6 idx_blend_product_code = 7 + idx_hot_product_code2 = 8 + idx_cold_product_code2 = 9 + idx_blend_product_code2 = 10 idx_of_eng = 2 idx_of_eng_des = 3 idx_of_thai = 0 @@ -539,7 +542,7 @@ out_xml( '\r\n') - + out_xml( '\t; parallel '+ spl[ idx_name][ idx_hot_product_code2] + ' ' + spl[ idx_name][ idx_cold_product_code2] + ' ' + spl[ idx_name][ idx_blend_product_code2] + ' \r\n') #print("++++++++++++++++++++++++++++++ " + str( count_test) ) #count_test = count_test + 1 #if count_test > 5 : diff --git a/xml/page_catalog.lxml b/xml/page_catalog.lxml index 546898fd..63054af3 100644 --- a/xml/page_catalog.lxml +++ b/xml/page_catalog.lxml @@ -210,10 +210,11 @@ Var god_of_hurr = 0 Var EngLangTest[god_of_hurr] = "test1" Var god_of_hurr = god_of_hurr + 1 + DEBUGVAR god_of_hurr Var EngLangTest[god_of_hurr] = "test2" DEBUGVAR EngLangTest[0] - DEBUGVAR EngLangTest[god_of_hurr] + DEBUGVAR EngLangTest[1] ; test step 2 @@ -302,7 +303,7 @@ - + If LanguageShow = "ENG" Then Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3" EndIf diff --git a/xml/page_catalog_group_appfast.lxml b/xml/page_catalog_group_appfast.lxml index 532a7241..ea16c608 100644 --- a/xml/page_catalog_group_appfast.lxml +++ b/xml/page_catalog_group_appfast.lxml @@ -770,6 +770,7 @@ essential nutrients center-vertical-horizontal + ; parallel - - - ; ==================> Len = 3 ; - 12-04-02-1019 - @@ -1037,6 +1038,7 @@ essential nutrients center-vertical-horizontal + ; parallel - - - ; ==================> Len = 3 ; - 12-04-02-1020 - @@ -1307,6 +1309,7 @@ essential nutrients center-vertical-horizontal + ; parallel - - - ; ==================> Len = 3 ; - 12-04-02-1021 - @@ -1577,6 +1580,7 @@ essential nutrients center-vertical-horizontal + ; parallel - - - ; ==================> Len = 3 ; - 12-04-02-1022 - @@ -1847,6 +1851,7 @@ essential nutrients center-vertical-horizontal + ; parallel - - - ; Cart ; sugar2 @@ -2042,8 +2064,8 @@ 352 77 SugarState2 - Var( DirImage + "/bn_hot_sugar2.png" ) - Var( DirImage + "/bp_hot_sugar2.png" ) + "ROOT/taobin_project/image/topping_inter/bn_sugar_4step.png" + "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2071,6 +2093,21 @@ DEBUGVAR topping1 Refresh + + 000053 + 0 + 1 + 198 + 52 + + + 000061 + 0 + 32 + 198 + 21 + + @@ -2079,8 +2116,8 @@ 555 77 SugarState3 - Var( DirImage + "/bn_hot_sugar3.png" ) - Var( DirImage + "/bp_hot_sugar3.png" ) + "ROOT/taobin_project/image/topping_inter/bn_sugar_4step.png" + "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2106,6 +2143,21 @@ DEBUGVAR topping1 Refresh + + 000054 + 0 + 1 + 198 + 52 + + + 000062 + 0 + 32 + 198 + 21 + + ; sugar4 @@ -2113,8 +2165,8 @@ 758 77 SugarState4 - Var( DirImage + "/bn_hot_sugar4.png" ) - Var( DirImage + "/bp_hot_sugar4.png" ) + "ROOT/taobin_project/image/topping_inter/bn_sugar_4step.png" + "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2140,6 +2192,21 @@ DEBUGVAR topping1 Refresh + + 000055 + 0 + 1 + 198 + 52 + + + 000063 + 0 + 32 + 198 + 21 + + ;- END topping2 @@ -2169,9 +2236,18 @@ ; sugar layout BGSugarColdHealthy - Var( DirImage + "/bg_sugar_bank_button.png" ) + "ROOT/taobin_project/image/topping_inter//bg_sugar_bank_button.png" + + 40 + 10 + 500 + 72 + + 000065 + + ; @@ -2180,8 +2256,8 @@ 149 77 SugarState1 - Var( DirImage + "/bn_cold_sugar1.png" ) - Var( DirImage + "/bp_cold_sugar1.png" ) + "ROOT/taobin_project/image/topping_inter/bn_sugar_4step.png" + "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2210,6 +2286,21 @@ DEBUGVAR topping1 Refresh + + 000052 + 0 + 1 + 198 + 52 + + + 000056 + 0 + 32 + 198 + 21 + + ; sugar2 @@ -2217,8 +2308,8 @@ 352 77 SugarState2 - Var( DirImage + "/bn_cold_sugar2.png" ) - Var( DirImage + "/bp_cold_sugar2.png" ) + "ROOT/taobin_project/image/topping_inter/bn_sugar_4step.png" + "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2246,6 +2337,21 @@ DEBUGVAR topping1 Refresh + + 000053 + 0 + 1 + 198 + 52 + + + 000057 + 0 + 32 + 198 + 21 + + @@ -2254,8 +2360,8 @@ 555 77 SugarState3 - Var( DirImage + "/bn_cold_sugar3.png" ) - Var( DirImage + "/bp_cold_sugar3.png" ) + "ROOT/taobin_project/image/topping_inter/bn_sugar_4step.png" + "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2281,6 +2387,21 @@ DEBUGVAR topping1 Refresh + + 000054 + 0 + 1 + 198 + 52 + + + 000058 + 0 + 32 + 198 + 21 + + ; sugar4 @@ -2288,8 +2409,8 @@ 758 77 SugarState4 - Var( DirImage + "/bn_cold_sugar4.png" ) - Var( DirImage + "/bp_cold_sugar4.png" ) + "ROOT/taobin_project/image/topping_inter/bn_sugar_4step.png" + "ROOT/taobin_project/image/topping_inter/bp_sugar_4step.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -2316,6 +2437,23 @@ DEBUGVAR topping1 Refresh + + + 000055 + 0 + 1 + 198 + 55 + + + 000059 + 0 + 32 + 198 + 21 + + + ;- END topping2 @@ -2562,7 +2700,11 @@ 0 0 "ROOT/taobin_project/image/topping_inter/bg_top_shot2.png" + + + + ; - - showText8 - 600 - 6 - Var( DirImage + "/text8.png" ) - +; +; showText8 +; 600 +; 6 +; Var( DirImage + "/text8.png" ) +; + + showText8 + 580 + 2 + 300 + 70 + + 000092 + + text_x_add_oreo_price @@ -2646,7 +2798,13 @@ text_price_6 - + + 120 + 12 + + 000101 + +