diff --git a/image/page2/bn_back_arrow_2.png b/image/page2/bn_back_arrow_2.png new file mode 100644 index 00000000..cfe6979e Binary files /dev/null and b/image/page2/bn_back_arrow_2.png differ diff --git a/image/page2/bn_eng_lang_2.png b/image/page2/bn_eng_lang_2.png new file mode 100644 index 00000000..64c3a948 Binary files /dev/null and b/image/page2/bn_eng_lang_2.png differ diff --git a/image/page2/bn_thai_lang_2.png b/image/page2/bn_thai_lang_2.png new file mode 100644 index 00000000..c9775bc3 Binary files /dev/null and b/image/page2/bn_thai_lang_2.png differ diff --git a/image/page2_en/bn_HealthyOption.png b/image/page2_en/bn_HealthyOption.png deleted file mode 100644 index a084c4ad..00000000 Binary files a/image/page2_en/bn_HealthyOption.png and /dev/null differ diff --git a/image/page2_en/bp_HealthyOption.png b/image/page2_en/bp_HealthyOption.png deleted file mode 100644 index 1b4b57b9..00000000 Binary files a/image/page2_en/bp_HealthyOption.png and /dev/null differ diff --git a/image/page2_en/page2/bn_HealthyOption.png b/image/page2_en/page2/bn_HealthyOption.png new file mode 100644 index 00000000..9ba2f2bb Binary files /dev/null and b/image/page2_en/page2/bn_HealthyOption.png differ diff --git a/image/page2_en/page2/bp_HealthyOption.png b/image/page2_en/page2/bp_HealthyOption.png new file mode 100644 index 00000000..28436aa5 Binary files /dev/null and b/image/page2_en/page2/bp_HealthyOption.png differ diff --git a/image/page3/bn_eng_lang.png b/image/page3/bn_eng_lang.png new file mode 100644 index 00000000..34fa5a2c Binary files /dev/null and b/image/page3/bn_eng_lang.png differ diff --git a/image/page_drink_picture2_n/bn_hot_Cappu_Healthy.png b/image/page_drink_picture2_n/bn_hot_Cappu_Healthy.png new file mode 100644 index 00000000..29e7bdfc Binary files /dev/null and b/image/page_drink_picture2_n/bn_hot_Cappu_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_Mocha_Healthy.png b/image/page_drink_picture2_n/bn_hot_Mocha_Healthy.png new file mode 100644 index 00000000..b1c38297 Binary files /dev/null and b/image/page_drink_picture2_n/bn_hot_Mocha_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_america_no_Healthy.png b/image/page_drink_picture2_n/bn_hot_america_no_Healthy.png index 7e09073b..f13c036e 100644 Binary files a/image/page_drink_picture2_n/bn_hot_america_no_Healthy.png and b/image/page_drink_picture2_n/bn_hot_america_no_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_hojicha_milk_tea_sing_Healthy.png b/image/page_drink_picture2_n/bn_hot_hojicha_milk_tea_sing_Healthy.png new file mode 100644 index 00000000..bc6e1461 Binary files /dev/null and b/image/page_drink_picture2_n/bn_hot_hojicha_milk_tea_sing_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_latte_Healthy.png b/image/page_drink_picture2_n/bn_hot_latte_Healthy.png new file mode 100644 index 00000000..432af78e Binary files /dev/null and b/image/page_drink_picture2_n/bn_hot_latte_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_lime_Oolong_tea_Healthy.png b/image/page_drink_picture2_n/bn_hot_lime_Oolong_tea_Healthy.png index d41a5842..2036eb90 100644 Binary files a/image/page_drink_picture2_n/bn_hot_lime_Oolong_tea_Healthy.png and b/image/page_drink_picture2_n/bn_hot_lime_Oolong_tea_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_limeblack tea_Healthy.png b/image/page_drink_picture2_n/bn_hot_limeblack tea_Healthy.png index afe5c63e..43535645 100644 Binary files a/image/page_drink_picture2_n/bn_hot_limeblack tea_Healthy.png and b/image/page_drink_picture2_n/bn_hot_limeblack tea_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_matcha_latte_Healthy.png b/image/page_drink_picture2_n/bn_hot_matcha_latte_Healthy.png new file mode 100644 index 00000000..8939ab6a Binary files /dev/null and b/image/page_drink_picture2_n/bn_hot_matcha_latte_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_matcha_tea_Healthy.png b/image/page_drink_picture2_n/bn_hot_matcha_tea_Healthy.png index 76b351a8..df5de8e2 100644 Binary files a/image/page_drink_picture2_n/bn_hot_matcha_tea_Healthy.png and b/image/page_drink_picture2_n/bn_hot_matcha_tea_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_oolong_tea_Healthy.png b/image/page_drink_picture2_n/bn_hot_oolong_tea_Healthy.png index b0b1b931..90594df6 100644 Binary files a/image/page_drink_picture2_n/bn_hot_oolong_tea_Healthy.png and b/image/page_drink_picture2_n/bn_hot_oolong_tea_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_hot_thai_milk_tea_Healthy.png b/image/page_drink_picture2_n/bn_hot_thai_milk_tea_Healthy.png new file mode 100644 index 00000000..2b063efc Binary files /dev/null and b/image/page_drink_picture2_n/bn_hot_thai_milk_tea_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_iced_cocoa_Healthy.png b/image/page_drink_picture2_n/bn_iced_cocoa_Healthy.png index c139d48a..336f0195 100644 Binary files a/image/page_drink_picture2_n/bn_iced_cocoa_Healthy.png and b/image/page_drink_picture2_n/bn_iced_cocoa_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_iced_lemonade_soda_Healthy.png b/image/page_drink_picture2_n/bn_iced_lemonade_soda_Healthy.png index 963d4c0a..fc2cb7cc 100644 Binary files a/image/page_drink_picture2_n/bn_iced_lemonade_soda_Healthy.png and b/image/page_drink_picture2_n/bn_iced_lemonade_soda_Healthy.png differ diff --git a/image/page_drink_picture2_n/bn_iced_milk_Healthy-1.png b/image/page_drink_picture2_n/bn_iced_milk_Healthy-1.png index 16306b9c..9aab23dc 100644 Binary files a/image/page_drink_picture2_n/bn_iced_milk_Healthy-1.png and b/image/page_drink_picture2_n/bn_iced_milk_Healthy-1.png differ diff --git a/image/page_drink_picture2_n/bn_iced_milk_Healthy.png b/image/page_drink_picture2_n/bn_iced_milk_Healthy.png index 9fb4a9ac..cb601ef3 100644 Binary files a/image/page_drink_picture2_n/bn_iced_milk_Healthy.png and b/image/page_drink_picture2_n/bn_iced_milk_Healthy.png differ diff --git a/image/topping2/bn_sugarlevel1-1.png b/image/topping2/bn_sugarlevel1-1.png new file mode 100644 index 00000000..1aa0620c Binary files /dev/null and b/image/topping2/bn_sugarlevel1-1.png differ diff --git a/image/topping2/bn_sugarlevel1.png b/image/topping2/bn_sugarlevel1.png new file mode 100644 index 00000000..ed91f9a7 Binary files /dev/null and b/image/topping2/bn_sugarlevel1.png differ diff --git a/image/topping2/bn_sugarlevel2.png b/image/topping2/bn_sugarlevel2.png new file mode 100644 index 00000000..488dcfb0 Binary files /dev/null and b/image/topping2/bn_sugarlevel2.png differ diff --git a/image/topping2/bn_sugarlevel4.png b/image/topping2/bn_sugarlevel4.png new file mode 100644 index 00000000..e8f4554a Binary files /dev/null and b/image/topping2/bn_sugarlevel4.png differ diff --git a/image/topping2/bn_sugarlevel5.png b/image/topping2/bn_sugarlevel5.png new file mode 100644 index 00000000..b249e2ea Binary files /dev/null and b/image/topping2/bn_sugarlevel5.png differ diff --git a/image/topping2/bn_sugarlevel6.png b/image/topping2/bn_sugarlevel6.png new file mode 100644 index 00000000..a22ae24f Binary files /dev/null and b/image/topping2/bn_sugarlevel6.png differ diff --git a/image/topping2/bp_sugarlevel1-1.png b/image/topping2/bp_sugarlevel1-1.png new file mode 100644 index 00000000..d76fffd1 Binary files /dev/null and b/image/topping2/bp_sugarlevel1-1.png differ diff --git a/image/topping2/bp_sugarlevel1.png b/image/topping2/bp_sugarlevel1.png new file mode 100644 index 00000000..2c80b729 Binary files /dev/null and b/image/topping2/bp_sugarlevel1.png differ diff --git a/image/topping2/bp_sugarlevel2.png b/image/topping2/bp_sugarlevel2.png new file mode 100644 index 00000000..48f0ca09 Binary files /dev/null and b/image/topping2/bp_sugarlevel2.png differ diff --git a/image/topping2/bp_sugarlevel4.png b/image/topping2/bp_sugarlevel4.png new file mode 100644 index 00000000..23468e12 Binary files /dev/null and b/image/topping2/bp_sugarlevel4.png differ diff --git a/image/topping2/bp_sugarlevel5.png b/image/topping2/bp_sugarlevel5.png new file mode 100644 index 00000000..43176373 Binary files /dev/null and b/image/topping2/bp_sugarlevel5.png differ diff --git a/image/topping2/bp_sugarlevel6.png b/image/topping2/bp_sugarlevel6.png new file mode 100644 index 00000000..483677ea Binary files /dev/null and b/image/topping2/bp_sugarlevel6.png differ diff --git a/image/topping2/bu_sugarlevel1-1.png b/image/topping2/bu_sugarlevel1-1.png new file mode 100644 index 00000000..a20877a0 Binary files /dev/null and b/image/topping2/bu_sugarlevel1-1.png differ diff --git a/image/topping2/bu_sugarlevel1.png b/image/topping2/bu_sugarlevel1.png new file mode 100644 index 00000000..b3a5dc90 Binary files /dev/null and b/image/topping2/bu_sugarlevel1.png differ diff --git a/image/topping2/bu_sugarlevel2.png b/image/topping2/bu_sugarlevel2.png new file mode 100644 index 00000000..f965442d Binary files /dev/null and b/image/topping2/bu_sugarlevel2.png differ diff --git a/image/topping2/bu_sugarlevel4.png b/image/topping2/bu_sugarlevel4.png new file mode 100644 index 00000000..ac0e65f7 Binary files /dev/null and b/image/topping2/bu_sugarlevel4.png differ diff --git a/image/topping2/bu_sugarlevel5.png b/image/topping2/bu_sugarlevel5.png new file mode 100644 index 00000000..f42aa1d9 Binary files /dev/null and b/image/topping2/bu_sugarlevel5.png differ diff --git a/image/topping2/bu_sugarlevel6.png b/image/topping2/bu_sugarlevel6.png new file mode 100644 index 00000000..656add22 Binary files /dev/null and b/image/topping2/bu_sugarlevel6.png differ diff --git a/image/topping2_en/bn_sugarlevel1-1.png b/image/topping2_en/bn_sugarlevel1-1.png new file mode 100644 index 00000000..bf407bb0 Binary files /dev/null and b/image/topping2_en/bn_sugarlevel1-1.png differ diff --git a/image/topping2_en/bn_sugarlevel1.png b/image/topping2_en/bn_sugarlevel1.png new file mode 100644 index 00000000..a9db8ee5 Binary files /dev/null and b/image/topping2_en/bn_sugarlevel1.png differ diff --git a/image/topping2_en/bn_sugarlevel2.png b/image/topping2_en/bn_sugarlevel2.png new file mode 100644 index 00000000..573b99c7 Binary files /dev/null and b/image/topping2_en/bn_sugarlevel2.png differ diff --git a/image/topping2_en/bn_sugarlevel4.png b/image/topping2_en/bn_sugarlevel4.png new file mode 100644 index 00000000..a163c90d Binary files /dev/null and b/image/topping2_en/bn_sugarlevel4.png differ diff --git a/image/topping2_en/bn_sugarlevel5.png b/image/topping2_en/bn_sugarlevel5.png new file mode 100644 index 00000000..83fb0f5d Binary files /dev/null and b/image/topping2_en/bn_sugarlevel5.png differ diff --git a/image/topping2_en/bn_sugarlevel6.png b/image/topping2_en/bn_sugarlevel6.png new file mode 100644 index 00000000..53ab225f Binary files /dev/null and b/image/topping2_en/bn_sugarlevel6.png differ diff --git a/image/topping2_en/bp_sugarlevel1-1.png b/image/topping2_en/bp_sugarlevel1-1.png new file mode 100644 index 00000000..cf1c5506 Binary files /dev/null and b/image/topping2_en/bp_sugarlevel1-1.png differ diff --git a/image/topping2_en/bp_sugarlevel1.png b/image/topping2_en/bp_sugarlevel1.png new file mode 100644 index 00000000..e13b9fa6 Binary files /dev/null and b/image/topping2_en/bp_sugarlevel1.png differ diff --git a/image/topping2_en/bp_sugarlevel2.png b/image/topping2_en/bp_sugarlevel2.png new file mode 100644 index 00000000..b019b8cd Binary files /dev/null and b/image/topping2_en/bp_sugarlevel2.png differ diff --git a/image/topping2_en/bp_sugarlevel4.png b/image/topping2_en/bp_sugarlevel4.png new file mode 100644 index 00000000..69f7e931 Binary files /dev/null and b/image/topping2_en/bp_sugarlevel4.png differ diff --git a/image/topping2_en/bp_sugarlevel5.png b/image/topping2_en/bp_sugarlevel5.png new file mode 100644 index 00000000..98fd2ee2 Binary files /dev/null and b/image/topping2_en/bp_sugarlevel5.png differ diff --git a/image/topping2_en/bp_sugarlevel6.png b/image/topping2_en/bp_sugarlevel6.png new file mode 100644 index 00000000..644787ba Binary files /dev/null and b/image/topping2_en/bp_sugarlevel6.png differ diff --git a/image/topping2_en/bu_sugarlevel1-1.png b/image/topping2_en/bu_sugarlevel1-1.png new file mode 100644 index 00000000..e47337a4 Binary files /dev/null and b/image/topping2_en/bu_sugarlevel1-1.png differ diff --git a/image/topping2_en/bu_sugarlevel1.png b/image/topping2_en/bu_sugarlevel1.png new file mode 100644 index 00000000..31249b33 Binary files /dev/null and b/image/topping2_en/bu_sugarlevel1.png differ diff --git a/image/topping2_en/bu_sugarlevel2.png b/image/topping2_en/bu_sugarlevel2.png new file mode 100644 index 00000000..a1c3775f Binary files /dev/null and b/image/topping2_en/bu_sugarlevel2.png differ diff --git a/image/topping2_en/bu_sugarlevel4.png b/image/topping2_en/bu_sugarlevel4.png new file mode 100644 index 00000000..e6606dde Binary files /dev/null and b/image/topping2_en/bu_sugarlevel4.png differ diff --git a/image/topping2_en/bu_sugarlevel5.png b/image/topping2_en/bu_sugarlevel5.png new file mode 100644 index 00000000..cd404f7d Binary files /dev/null and b/image/topping2_en/bu_sugarlevel5.png differ diff --git a/image/topping2_en/bu_sugarlevel6.png b/image/topping2_en/bu_sugarlevel6.png new file mode 100644 index 00000000..896a523e Binary files /dev/null and b/image/topping2_en/bu_sugarlevel6.png differ diff --git a/xml/menu_catalog_default_init.xml b/xml/menu_catalog_default_init.xml index 85543913..5f77ccd6 100644 --- a/xml/menu_catalog_default_init.xml +++ b/xml/menu_catalog_default_init.xml @@ -8,8 +8,8 @@ Var showthaiText = "Invisible" Var showengText = "Enable" Var DirImage = "ROOT/taobin_project/image/page3_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 show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" Var ice_tab_text = "Ice will be ready at " @@ -18,8 +18,8 @@ Var showthaiText = "Enable" Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " EndIf @@ -34,53 +34,10 @@ ; SpiralOnline If SpiralOnline = "true" Then - Var Menu1Selected2 = "Enable" - Var Menu2Selected2 = "Enable" - Var Menu3Selected2 = "Enable" - Var Menu4Selected2 = "Enable" - - Var Menu6Selected2 = "Enable" - Var Menu7Selected2 = "Enable" Var MenuVSelected2 = "Enable" + EndIf + Var MenuVSelected2 = "Invisible" - - - If AppFastEnable = "true" Then - Var Menu11Selected2 = "Enable" - Var Menu21Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected2 = "Invisible" - Var Menu21Selected2 = "Enable" - Var Menu7Selected2 = "Invisible" - Else - Var Menu11Selected2 = "Invisible" - Var Menu21Selected2 = "Invisible" - Var Menu7Selected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Invisible" - Var Menu2Selected = "Invisible" - Var Menu3Selected = "Invisible" - Var Menu4Selected = "Invisible" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Invisible" - Var Menu7Selected = "Invisible" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - Var Menu21Selected = "Invisible" - - Var Menu11Selected = "Invisible" - Var Menu7Selected = "Invisible" - ; fuck - - Var Menu22Selected = "Enable" - Else Var Menu1Selected2 = "Invisible" Var Menu2Selected2 = "Invisible" Var Menu3Selected2 = "Invisible" @@ -93,7 +50,7 @@ Var Menu21Selected2 = "Invisible" - + Var MenuVSelected2 = "Invisible" ; init default Var Menu1Selected = "Enable" Var Menu2Selected = "Enable" @@ -130,4 +87,3 @@ Var Menu22Selected = "Enable" - EndIf diff --git a/xml/menu_catalog_new.xml b/xml/menu_catalog_new.xml index 212394ff..529ebd53 100644 --- a/xml/menu_catalog_new.xml +++ b/xml/menu_catalog_new.xml @@ -118,9 +118,9 @@ ; back ; menu row 2 + + +;============================================================================= + - - +;============================================================================= - + + + + + + + + 70 + 583 + Var(DirImage + "/text1.png") + + + + +; menu row 1 + + + + +; menu row 2 + + + + + + + + + +;============================================================================= + + + + + +;============================================================================= + + + + + + + + + + + 5 + 1880 + 24 + Center + 1080 + RobotoRegular + 0xFFFFFF + ShowNetworkProblemText + + + + +; +; 895 +; QRCODE99_Y +; 178 +; 178 +; "Enable" +; testservice +; + + + +; Cart + + + + + DEBUGVAR web_ready + If web_ready = "true" Then + If web_ref = QRCODE99x Then + + Var web_readyOK = web_ready + Var web_telnumOK = web_telnum + + Var web_app_prepar = "true" + + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + + EndIf + Else + EndIf + + + + + + diff --git a/xml/page_catalog_group_appfast.xml b/xml/page_catalog_group_appfast.xml index 1d8fa176..5bdbc8b6 100644 --- a/xml/page_catalog_group_appfast.xml +++ b/xml/page_catalog_group_appfast.xml @@ -18,8 +18,8 @@ Var showthaiText = "Invisible" Var showengText = "Enable" Var DirImage = "ROOT/taobin_project/image/page3_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 show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" Var ice_tab_text = "Ice will be ready at " @@ -28,8 +28,8 @@ Var showthaiText = "Enable" Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " EndIf @@ -44,53 +44,10 @@ ; SpiralOnline If SpiralOnline = "true" Then - Var Menu1Selected2 = "Enable" - Var Menu2Selected2 = "Enable" - Var Menu3Selected2 = "Enable" - Var Menu4Selected2 = "Enable" - - Var Menu6Selected2 = "Enable" - Var Menu7Selected2 = "Enable" Var MenuVSelected2 = "Enable" + EndIf + Var MenuVSelected2 = "Invisible" - - - If AppFastEnable = "true" Then - Var Menu11Selected2 = "Enable" - Var Menu21Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected2 = "Invisible" - Var Menu21Selected2 = "Enable" - Var Menu7Selected2 = "Invisible" - Else - Var Menu11Selected2 = "Invisible" - Var Menu21Selected2 = "Invisible" - Var Menu7Selected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Invisible" - Var Menu2Selected = "Invisible" - Var Menu3Selected = "Invisible" - Var Menu4Selected = "Invisible" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Invisible" - Var Menu7Selected = "Invisible" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - Var Menu21Selected = "Invisible" - - Var Menu11Selected = "Invisible" - Var Menu7Selected = "Invisible" - ; fuck - - Var Menu22Selected = "Enable" - Else Var Menu1Selected2 = "Invisible" Var Menu2Selected2 = "Invisible" Var Menu3Selected2 = "Invisible" @@ -103,7 +60,7 @@ Var Menu21Selected2 = "Invisible" - + Var MenuVSelected2 = "Invisible" ; init default Var Menu1Selected = "Enable" Var Menu2Selected = "Enable" @@ -140,7 +97,6 @@ Var Menu22Selected = "Enable" - EndIf @@ -305,9 +261,9 @@ ; back