diff --git a/image/collectiing/text_show_error5.png b/image/collectiing/text_show_error5.png new file mode 100644 index 00000000..a1d1cf66 Binary files /dev/null and b/image/collectiing/text_show_error5.png differ diff --git a/image/collectiing_en/text_show_error5.png b/image/collectiing_en/text_show_error5.png new file mode 100644 index 00000000..266c3c61 Binary files /dev/null and b/image/collectiing_en/text_show_error5.png differ diff --git a/image/page_drink_disable_n2/bn_hot_Cappu_Healthy.png b/image/page_drink_disable_n2/bn_hot_Cappu_Healthy.png index 7e35e1d8..19797d4b 100644 Binary files a/image/page_drink_disable_n2/bn_hot_Cappu_Healthy.png and b/image/page_drink_disable_n2/bn_hot_Cappu_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_america_no_Healthy.png b/image/page_drink_disable_n2/bn_hot_america_no_Healthy.png index 6d5418ab..2fd6e038 100644 Binary files a/image/page_drink_disable_n2/bn_hot_america_no_Healthy.png and b/image/page_drink_disable_n2/bn_hot_america_no_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_blacktea.png b/image/page_drink_disable_n2/bn_hot_blacktea.png index 2bbf7d5c..524d4243 100644 Binary files a/image/page_drink_disable_n2/bn_hot_blacktea.png and b/image/page_drink_disable_n2/bn_hot_blacktea.png differ diff --git a/image/page_drink_disable_n2/bn_hot_hojicha_milk_tea_sing_Healthy.png b/image/page_drink_disable_n2/bn_hot_hojicha_milk_tea_sing_Healthy.png index d3a4c8e1..8a1d3d9e 100644 Binary files a/image/page_drink_disable_n2/bn_hot_hojicha_milk_tea_sing_Healthy.png and b/image/page_drink_disable_n2/bn_hot_hojicha_milk_tea_sing_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_latte_Healthy.png b/image/page_drink_disable_n2/bn_hot_latte_Healthy.png index 18783231..7189add7 100644 Binary files a/image/page_drink_disable_n2/bn_hot_latte_Healthy.png and b/image/page_drink_disable_n2/bn_hot_latte_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_lime_Oolong_tea_Healthy.png b/image/page_drink_disable_n2/bn_hot_lime_Oolong_tea_Healthy.png index df142368..a1f562a4 100644 Binary files a/image/page_drink_disable_n2/bn_hot_lime_Oolong_tea_Healthy.png and b/image/page_drink_disable_n2/bn_hot_lime_Oolong_tea_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_limeblack tea_Healthy.png b/image/page_drink_disable_n2/bn_hot_limeblack tea_Healthy.png index 194e46ed..23afe160 100644 Binary files a/image/page_drink_disable_n2/bn_hot_limeblack tea_Healthy.png and b/image/page_drink_disable_n2/bn_hot_limeblack tea_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_matcha_latte_Healthy.png b/image/page_drink_disable_n2/bn_hot_matcha_latte_Healthy.png index cba73338..697988df 100644 Binary files a/image/page_drink_disable_n2/bn_hot_matcha_latte_Healthy.png and b/image/page_drink_disable_n2/bn_hot_matcha_latte_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_matcha_tea_Healthy.png b/image/page_drink_disable_n2/bn_hot_matcha_tea_Healthy.png index 8e77f7ed..865ea871 100644 Binary files a/image/page_drink_disable_n2/bn_hot_matcha_tea_Healthy.png and b/image/page_drink_disable_n2/bn_hot_matcha_tea_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_mocha_Healthy.png b/image/page_drink_disable_n2/bn_hot_mocha_Healthy.png index 4dca57c2..3d1fba27 100644 Binary files a/image/page_drink_disable_n2/bn_hot_mocha_Healthy.png and b/image/page_drink_disable_n2/bn_hot_mocha_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_oolong_tea_Healthy.png b/image/page_drink_disable_n2/bn_hot_oolong_tea_Healthy.png index e1adb504..2a2365d9 100644 Binary files a/image/page_drink_disable_n2/bn_hot_oolong_tea_Healthy.png and b/image/page_drink_disable_n2/bn_hot_oolong_tea_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_taiwan_milk_tea_Jason_Healthy.png b/image/page_drink_disable_n2/bn_hot_taiwan_milk_tea_Jason_Healthy.png index a97bbdc2..e2c7ce38 100644 Binary files a/image/page_drink_disable_n2/bn_hot_taiwan_milk_tea_Jason_Healthy.png and b/image/page_drink_disable_n2/bn_hot_taiwan_milk_tea_Jason_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_hot_thai_milk_tea_Healthy.png b/image/page_drink_disable_n2/bn_hot_thai_milk_tea_Healthy.png index a4da1faa..bb82f09e 100644 Binary files a/image/page_drink_disable_n2/bn_hot_thai_milk_tea_Healthy.png and b/image/page_drink_disable_n2/bn_hot_thai_milk_tea_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_iced_cocoa_Healthy.png b/image/page_drink_disable_n2/bn_iced_cocoa_Healthy.png index b410c647..08c11d66 100644 Binary files a/image/page_drink_disable_n2/bn_iced_cocoa_Healthy.png and b/image/page_drink_disable_n2/bn_iced_cocoa_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_iced_lemonade_soda_Healthy.png b/image/page_drink_disable_n2/bn_iced_lemonade_soda_Healthy.png index 1a38bcfb..630a5c4e 100644 Binary files a/image/page_drink_disable_n2/bn_iced_lemonade_soda_Healthy.png and b/image/page_drink_disable_n2/bn_iced_lemonade_soda_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_iced_milk_Healthy.png b/image/page_drink_disable_n2/bn_iced_milk_Healthy.png index 444c2525..3eb78327 100644 Binary files a/image/page_drink_disable_n2/bn_iced_milk_Healthy.png and b/image/page_drink_disable_n2/bn_iced_milk_Healthy.png differ diff --git a/image/page_drink_disable_n2/bn_limande_Healthy.png b/image/page_drink_disable_n2/bn_limande_Healthy.png index f6f9397e..59a87ca9 100644 Binary files a/image/page_drink_disable_n2/bn_limande_Healthy.png and b/image/page_drink_disable_n2/bn_limande_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_Cappu_Healthy.png b/image/page_drink_n/bn_hot_Cappu_Healthy.png index 5fdbd840..2c5aace5 100644 Binary files a/image/page_drink_n/bn_hot_Cappu_Healthy.png and b/image/page_drink_n/bn_hot_Cappu_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_america_no_Healthy.png b/image/page_drink_n/bn_hot_america_no_Healthy.png index bb741299..3c11f6cb 100644 Binary files a/image/page_drink_n/bn_hot_america_no_Healthy.png and b/image/page_drink_n/bn_hot_america_no_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_blacktea.png b/image/page_drink_n/bn_hot_blacktea.png index 7c7cfa68..6e66e347 100644 Binary files a/image/page_drink_n/bn_hot_blacktea.png and b/image/page_drink_n/bn_hot_blacktea.png differ diff --git a/image/page_drink_n/bn_hot_hojicha_milk_tea_sing_Healthy.png b/image/page_drink_n/bn_hot_hojicha_milk_tea_sing_Healthy.png index 63f62ac0..f525d9f0 100644 Binary files a/image/page_drink_n/bn_hot_hojicha_milk_tea_sing_Healthy.png and b/image/page_drink_n/bn_hot_hojicha_milk_tea_sing_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_latte_Healthy.png b/image/page_drink_n/bn_hot_latte_Healthy.png index 87d8ec11..9d7b5f6b 100644 Binary files a/image/page_drink_n/bn_hot_latte_Healthy.png and b/image/page_drink_n/bn_hot_latte_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_lime_Oolong_tea_Healthy.png b/image/page_drink_n/bn_hot_lime_Oolong_tea_Healthy.png index 47358c26..cdc1c9fc 100644 Binary files a/image/page_drink_n/bn_hot_lime_Oolong_tea_Healthy.png and b/image/page_drink_n/bn_hot_lime_Oolong_tea_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_limeblack tea_Healthy.png b/image/page_drink_n/bn_hot_limeblack tea_Healthy.png index 5f2612a7..20b605ca 100644 Binary files a/image/page_drink_n/bn_hot_limeblack tea_Healthy.png and b/image/page_drink_n/bn_hot_limeblack tea_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_matcha_latte_Healthy.png b/image/page_drink_n/bn_hot_matcha_latte_Healthy.png index 862b48fc..d6b81782 100644 Binary files a/image/page_drink_n/bn_hot_matcha_latte_Healthy.png and b/image/page_drink_n/bn_hot_matcha_latte_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_matcha_tea_Healthy.png b/image/page_drink_n/bn_hot_matcha_tea_Healthy.png index bf349dca..6023289d 100644 Binary files a/image/page_drink_n/bn_hot_matcha_tea_Healthy.png and b/image/page_drink_n/bn_hot_matcha_tea_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_mocha_Healthy.png b/image/page_drink_n/bn_hot_mocha_Healthy.png index b48b524a..36328525 100644 Binary files a/image/page_drink_n/bn_hot_mocha_Healthy.png and b/image/page_drink_n/bn_hot_mocha_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_oolong_tea_Healthy.png b/image/page_drink_n/bn_hot_oolong_tea_Healthy.png index f9819e0f..6d5038cd 100644 Binary files a/image/page_drink_n/bn_hot_oolong_tea_Healthy.png and b/image/page_drink_n/bn_hot_oolong_tea_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png b/image/page_drink_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png index 361a11dd..8797d3a3 100644 Binary files a/image/page_drink_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png and b/image/page_drink_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png differ diff --git a/image/page_drink_n/bn_hot_thai_milk_tea_Healthy.png b/image/page_drink_n/bn_hot_thai_milk_tea_Healthy.png index 0b273b45..09d0d9e5 100644 Binary files a/image/page_drink_n/bn_hot_thai_milk_tea_Healthy.png and b/image/page_drink_n/bn_hot_thai_milk_tea_Healthy.png differ diff --git a/image/page_drink_n/bn_iced_cocoa_Healthy.png b/image/page_drink_n/bn_iced_cocoa_Healthy.png index 750cf983..bb6860ee 100644 Binary files a/image/page_drink_n/bn_iced_cocoa_Healthy.png and b/image/page_drink_n/bn_iced_cocoa_Healthy.png differ diff --git a/image/page_drink_n/bn_iced_lemonade_soda_Healthy.png b/image/page_drink_n/bn_iced_lemonade_soda_Healthy.png index 724c09da..88e3af53 100644 Binary files a/image/page_drink_n/bn_iced_lemonade_soda_Healthy.png and b/image/page_drink_n/bn_iced_lemonade_soda_Healthy.png differ diff --git a/image/page_drink_n/bn_iced_milk_Healthy.png b/image/page_drink_n/bn_iced_milk_Healthy.png index d7f1149e..c14ccbdf 100644 Binary files a/image/page_drink_n/bn_iced_milk_Healthy.png and b/image/page_drink_n/bn_iced_milk_Healthy.png differ diff --git a/image/page_drink_n/bn_limande_Healthy.png b/image/page_drink_n/bn_limande_Healthy.png index 91f64d3b..923ad59f 100644 Binary files a/image/page_drink_n/bn_limande_Healthy.png and b/image/page_drink_n/bn_limande_Healthy.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 index 1f4862fb..44c406c0 100644 Binary files a/image/page_drink_picture2_n/bn_hot_Cappu_Healthy.png 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 index ea907582..b332f1de 100644 Binary files a/image/page_drink_picture2_n/bn_hot_Mocha_Healthy.png 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 e4c1ac77..d7d06947 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_blacktea.png b/image/page_drink_picture2_n/bn_hot_blacktea.png index 915b9b55..c854c69b 100644 Binary files a/image/page_drink_picture2_n/bn_hot_blacktea.png and b/image/page_drink_picture2_n/bn_hot_blacktea.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 index 18ba4418..410dc84b 100644 Binary files a/image/page_drink_picture2_n/bn_hot_hojicha_milk_tea_sing_Healthy.png 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 index 3b830500..10571d48 100644 Binary files a/image/page_drink_picture2_n/bn_hot_latte_Healthy.png 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 e8feba75..298c7cd8 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 d50e8c5d..1e66cb38 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 index 4553454f..b461140f 100644 Binary files a/image/page_drink_picture2_n/bn_hot_matcha_latte_Healthy.png 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 b3d83fd4..b821ee93 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 c790109d..06e30146 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_taiwan_milk_tea_Jason_Healthy.png b/image/page_drink_picture2_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png index deb3bbd0..757703b4 100644 Binary files a/image/page_drink_picture2_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png and b/image/page_drink_picture2_n/bn_hot_taiwan_milk_tea_Jason_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 index d26f97c1..f1cae048 100644 Binary files a/image/page_drink_picture2_n/bn_hot_thai_milk_tea_Healthy.png 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 3f662bf3..6ea527c2 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 2f718ab5..9b0dcdbd 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 6cbb4b27..f9d6d80b 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 0085edeb..57faa232 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/page_drink_press_n/bn_hot_Cappu_Healthy.png b/image/page_drink_press_n/bn_hot_Cappu_Healthy.png index bdba71a9..0ba97263 100644 Binary files a/image/page_drink_press_n/bn_hot_Cappu_Healthy.png and b/image/page_drink_press_n/bn_hot_Cappu_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_america_no_Healthy.png b/image/page_drink_press_n/bn_hot_america_no_Healthy.png index b14a2bbd..167a2691 100644 Binary files a/image/page_drink_press_n/bn_hot_america_no_Healthy.png and b/image/page_drink_press_n/bn_hot_america_no_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_blacktea.png b/image/page_drink_press_n/bn_hot_blacktea.png index e6a1dbcd..a33bafc2 100644 Binary files a/image/page_drink_press_n/bn_hot_blacktea.png and b/image/page_drink_press_n/bn_hot_blacktea.png differ diff --git a/image/page_drink_press_n/bn_hot_hojicha_milk_tea_sing_Healthy.png b/image/page_drink_press_n/bn_hot_hojicha_milk_tea_sing_Healthy.png index a23cba1f..905f638b 100644 Binary files a/image/page_drink_press_n/bn_hot_hojicha_milk_tea_sing_Healthy.png and b/image/page_drink_press_n/bn_hot_hojicha_milk_tea_sing_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_latte_Healthy.png b/image/page_drink_press_n/bn_hot_latte_Healthy.png index 4ddd898c..e8816612 100644 Binary files a/image/page_drink_press_n/bn_hot_latte_Healthy.png and b/image/page_drink_press_n/bn_hot_latte_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_lime_Oolong_tea_Healthy.png b/image/page_drink_press_n/bn_hot_lime_Oolong_tea_Healthy.png index 93fbc54e..75e74d0e 100644 Binary files a/image/page_drink_press_n/bn_hot_lime_Oolong_tea_Healthy.png and b/image/page_drink_press_n/bn_hot_lime_Oolong_tea_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_limeblack tea_Healthy.png b/image/page_drink_press_n/bn_hot_limeblack tea_Healthy.png index 398cf05e..25e3543f 100644 Binary files a/image/page_drink_press_n/bn_hot_limeblack tea_Healthy.png and b/image/page_drink_press_n/bn_hot_limeblack tea_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_matcha_latte_Healthy.png b/image/page_drink_press_n/bn_hot_matcha_latte_Healthy.png index 8cb65059..e8d78ccd 100644 Binary files a/image/page_drink_press_n/bn_hot_matcha_latte_Healthy.png and b/image/page_drink_press_n/bn_hot_matcha_latte_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_matcha_tea_Healthy.png b/image/page_drink_press_n/bn_hot_matcha_tea_Healthy.png index 2e54c867..28767328 100644 Binary files a/image/page_drink_press_n/bn_hot_matcha_tea_Healthy.png and b/image/page_drink_press_n/bn_hot_matcha_tea_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_mocha_Healthy.png b/image/page_drink_press_n/bn_hot_mocha_Healthy.png index a62b1b9c..9619152e 100644 Binary files a/image/page_drink_press_n/bn_hot_mocha_Healthy.png and b/image/page_drink_press_n/bn_hot_mocha_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_oolong_tea_Healthy.png b/image/page_drink_press_n/bn_hot_oolong_tea_Healthy.png index 165a55dd..d1c0be65 100644 Binary files a/image/page_drink_press_n/bn_hot_oolong_tea_Healthy.png and b/image/page_drink_press_n/bn_hot_oolong_tea_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png b/image/page_drink_press_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png index 08589488..0e52ed4f 100644 Binary files a/image/page_drink_press_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png and b/image/page_drink_press_n/bn_hot_taiwan_milk_tea_Jason_Healthy.png differ diff --git a/image/page_drink_press_n/bn_hot_thai_milk_tea_Healthy.png b/image/page_drink_press_n/bn_hot_thai_milk_tea_Healthy.png index d95fd4f7..b6544249 100644 Binary files a/image/page_drink_press_n/bn_hot_thai_milk_tea_Healthy.png and b/image/page_drink_press_n/bn_hot_thai_milk_tea_Healthy.png differ diff --git a/image/page_drink_press_n/bn_iced_cocoa_Healthy.png b/image/page_drink_press_n/bn_iced_cocoa_Healthy.png index 6c3a3e59..87e398f5 100644 Binary files a/image/page_drink_press_n/bn_iced_cocoa_Healthy.png and b/image/page_drink_press_n/bn_iced_cocoa_Healthy.png differ diff --git a/image/page_drink_press_n/bn_iced_lemonade_soda_Healthy.png b/image/page_drink_press_n/bn_iced_lemonade_soda_Healthy.png index aafdd356..07fa87c3 100644 Binary files a/image/page_drink_press_n/bn_iced_lemonade_soda_Healthy.png and b/image/page_drink_press_n/bn_iced_lemonade_soda_Healthy.png differ diff --git a/image/page_drink_press_n/bn_iced_milk_Healthy.png b/image/page_drink_press_n/bn_iced_milk_Healthy.png index c8eeacbf..0370fc8b 100644 Binary files a/image/page_drink_press_n/bn_iced_milk_Healthy.png and b/image/page_drink_press_n/bn_iced_milk_Healthy.png differ diff --git a/image/page_drink_press_n/bn_limande_Healthy.png b/image/page_drink_press_n/bn_limande_Healthy.png index da63a608..9af27553 100644 Binary files a/image/page_drink_press_n/bn_limande_Healthy.png and b/image/page_drink_press_n/bn_limande_Healthy.png differ diff --git a/image/page_payment/img_popup4.png b/image/page_payment/img_popup4.png index b6a1c84f..5bc8ec54 100644 Binary files a/image/page_payment/img_popup4.png and b/image/page_payment/img_popup4.png differ diff --git a/image/page_payment/img_popup7.png b/image/page_payment/img_popup7.png new file mode 100644 index 00000000..7d4142cf Binary files /dev/null and b/image/page_payment/img_popup7.png differ diff --git a/image/page_payment_en/page_payment/img_popup4.png b/image/page_payment_en/page_payment/img_popup4.png index 63a90484..9bb7b6b0 100644 Binary files a/image/page_payment_en/page_payment/img_popup4.png and b/image/page_payment_en/page_payment/img_popup4.png differ diff --git a/image/page_payment_en/page_payment/img_popup7.png b/image/page_payment_en/page_payment/img_popup7.png new file mode 100644 index 00000000..106b8012 Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup7.png differ diff --git a/image/topping2/bn_sugarlevel3.png b/image/topping2/bn_sugarlevel3.png new file mode 100644 index 00000000..1aa0620c Binary files /dev/null and b/image/topping2/bn_sugarlevel3.png differ diff --git a/image/topping2/bp_sugarlevel3.png b/image/topping2/bp_sugarlevel3.png new file mode 100644 index 00000000..d76fffd1 Binary files /dev/null and b/image/topping2/bp_sugarlevel3.png differ diff --git a/image/topping2/bu_sugarlevel3.png b/image/topping2/bu_sugarlevel3.png new file mode 100644 index 00000000..a20877a0 Binary files /dev/null and b/image/topping2/bu_sugarlevel3.png differ diff --git a/image/topping2_en/bn_sugarlevel3.png b/image/topping2_en/bn_sugarlevel3.png new file mode 100644 index 00000000..bf407bb0 Binary files /dev/null and b/image/topping2_en/bn_sugarlevel3.png differ diff --git a/image/topping2_en/bp_sugarlevel3.png b/image/topping2_en/bp_sugarlevel3.png new file mode 100644 index 00000000..cf1c5506 Binary files /dev/null and b/image/topping2_en/bp_sugarlevel3.png differ diff --git a/image/topping2_en/bu_sugarlevel3.png b/image/topping2_en/bu_sugarlevel3.png new file mode 100644 index 00000000..e47337a4 Binary files /dev/null and b/image/topping2_en/bu_sugarlevel3.png differ diff --git a/sound_eng/Code8digit.mp3 b/sound_eng/Code8digit.mp3 new file mode 100755 index 00000000..fcebd3fe Binary files /dev/null and b/sound_eng/Code8digit.mp3 differ diff --git a/sound_eng/next_drink.mp3 b/sound_eng/next_drink.mp3 new file mode 100755 index 00000000..b35fc2db Binary files /dev/null and b/sound_eng/next_drink.mp3 differ diff --git a/xml/page_board.xml b/xml/page_board.xml index 4fc4b945..5f176473 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -975,7 +975,7 @@ Var NextPage = "-" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml" TopView "show" diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 208c92a9..f0a0f3ed 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -124,6 +124,10 @@ Var AddData = 0 + DEBUGVAR Seeker.TNumberTaobinMember + DEBUGVAR Seeker.PointTaobinStr + + If Seeker.TNumberTaobinMember = "" Then Else @@ -401,7 +405,11 @@ If EnableSelectMenuBetweenBrew = "Enable" Then If Timeout = 5 Then - PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/next_drink.mp3" + If show_eng = "true" Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/next_drink.mp3" + Else + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/next_drink.mp3" + EndIf EndIf If Timeout = 9 Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3" @@ -706,7 +714,7 @@ If AddData = 1 Then Var Cid = 26 - AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore + AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore EndIf Var ServiceType = "coffee" @@ -813,7 +821,7 @@ If AddData = 1 Then Var Cid = 26 - AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore + AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore EndIf diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml index cfb25024..fb61fc67 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -88,6 +88,9 @@ Var AddData = 0 + DEBUGVAR Seeker.TNumberTaobinMember + DEBUGVAR Seeker.PointTaobinStr + If Seeker.TNumberTaobinMember = "" Then Else @@ -563,7 +566,7 @@ If AddData = 1 Then Var Cid = 26 - AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore + AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore EndIf Var ServiceType = "coffee" @@ -674,7 +677,7 @@ If AddData = 1 Then Var Cid = 26 - AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore + AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore EndIf diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml index 27f41810..3e3107b6 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -1,494 +1,500 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - 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 " - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - 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 - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - - Var Menu22Selected = "Enable" - - - Var Menu2Selected = "PressForever" - - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + 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 " + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + 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 + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + + Var Menu22Selected = "Enable" + + + Var Menu2Selected = "PressForever" + + + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + SAVELOG "COA9" + Open NextPage + EndIf + Else + If Timeout > 30 Then + SAVELOG "COA30" + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + SAVELOG "Timeout" + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + SAVELOG "Back" + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + If Seeker = "curr" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var EmergencyStop = "true" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + EndIf + EndIf + + If IgnoreNetCore = "true" Then + + Else + ;stop_now + If NETCORE_LOST_CNT > 120 Then + Var stop_now = "true" + Var MachineErrorDetailAll = "???" + SAVELOG "NETCORE_LOST_CNT" + + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + EndIf + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + +; + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + 10 497 @@ -857,7 +863,7 @@ KanitMediumTTF 0x322B26 showengText - "DOUBLE + "DOUBLE ESPRESSO" @@ -1335,7 +1341,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต Guji Queen Berry" @@ -1346,7 +1352,7 @@ Guji Queen Berry" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -1358,7 +1364,7 @@ Guji Queen Berry" KanitMediumTTF 0x322B26 showengText - "ESPRESSO + "ESPRESSO ETHIOPAI GUJI" @@ -1369,7 +1375,7 @@ ETHIOPAI GUJI" KanitMediumTTF 0x6F5F51 showengText - "Light roast natural process: + "Light roast natural process: Strawberry, Orange, Floral" @@ -1588,7 +1594,7 @@ Strawberry, Orange, Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต BLUE DADDY" @@ -1599,7 +1605,7 @@ BLUE DADDY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed process + "Washed process หอมบลูเบอร์รี และดอกไม้" @@ -1611,7 +1617,7 @@ BLUE DADDY" KanitMediumTTF 0x322B26 showengText - "BLUE DADDY + "BLUE DADDY ESPRESSO" @@ -1622,7 +1628,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Washed process + "Washed process Note: Blue Berry & Floral" @@ -1841,7 +1847,7 @@ Note: Blue Berry & Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต MOZART " @@ -1852,7 +1858,7 @@ MOZART " KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -1864,7 +1870,7 @@ MOZART " KanitMediumTTF 0x322B26 showengText - "MOZART + "MOZART ESPRESSO" @@ -1875,7 +1881,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -2094,7 +2100,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต SNOWWHITE" @@ -2105,7 +2111,7 @@ SNOWWHITE" KanitMediumTTF 0x6F5F51 showthaiText - "Anaerobic process + "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" @@ -2117,7 +2123,7 @@ SNOWWHITE" KanitMediumTTF 0x322B26 showengText - "SNOWWHITE + "SNOWWHITE ESPRESSO" @@ -2128,7 +2134,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Anaerobic process + "Anaerobic process Note: Jasmine & Honey" @@ -2347,7 +2353,7 @@ Note: Jasmine & Honey" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต WHISKY DUDE" @@ -2358,7 +2364,7 @@ WHISKY DUDE" KanitMediumTTF 0x6F5F51 showthaiText - "Washed Sherry cask ferment + "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" @@ -2370,7 +2376,7 @@ WHISKY DUDE" KanitMediumTTF 0x322B26 showengText - "WHISKY DUDE + "WHISKY DUDE ESPRESSO" @@ -2381,7 +2387,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Washed Sherry cask ferment + "Washed Sherry cask ferment Note: Whisky & Vanilla" @@ -2600,7 +2606,7 @@ Note: Whisky & Vanilla" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต PEACHER" @@ -2611,7 +2617,7 @@ PEACHER" KanitMediumTTF 0x6F5F51 showthaiText - "Barrel-aged process + "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" @@ -2623,7 +2629,7 @@ PEACHER" KanitMediumTTF 0x322B26 showengText - "PEACHER + "PEACHER ESPRESSO" @@ -2634,7 +2640,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Barrel-aged process + "Barrel-aged process Note: Peach, tea, chocolate" @@ -2853,7 +2859,7 @@ Note: Peach, tea, chocolate" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต PURE BEAUTY" @@ -2864,7 +2870,7 @@ PURE BEAUTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" @@ -2876,7 +2882,7 @@ PURE BEAUTY" KanitMediumTTF 0x322B26 showengText - "PURE BEAUTY + "PURE BEAUTY ESPRESSO" @@ -3105,7 +3111,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต GEISHA" @@ -3355,7 +3361,7 @@ GEISHA" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต ROSALYN" @@ -3366,7 +3372,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" @@ -3388,7 +3394,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showengText - "Light Roast (natural process) + "Light Roast (natural process) Pink​ Rose & Berry" @@ -3628,7 +3634,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x322B26 showengText - "ICED AMERICANO + "ICED AMERICANO SODA" @@ -3853,7 +3859,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน Guji Queen Berry" @@ -3864,7 +3870,7 @@ Guji Queen Berry" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -3876,7 +3882,7 @@ Guji Queen Berry" KanitMediumTTF 0x322B26 showengText - "AMERICANO + "AMERICANO ETHIOPAI GUJI" @@ -3887,7 +3893,7 @@ ETHIOPAI GUJI" KanitMediumTTF 0x6F5F51 showengText - "Light roast natural process: + "Light roast natural process: Strawberry, Orange, Floral" @@ -4106,7 +4112,7 @@ Strawberry, Orange, Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน BLUE DADDY" @@ -4117,7 +4123,7 @@ BLUE DADDY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed process + "Washed process หอมบลูเบอร์รี และดอกไม้" @@ -4129,7 +4135,7 @@ BLUE DADDY" KanitMediumTTF 0x322B26 showengText - "BLUE DADDY + "BLUE DADDY AMERICANO" @@ -4140,7 +4146,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Washed process + "Washed process Note: Blue Berry & Floral" @@ -4359,7 +4365,7 @@ Note: Blue Berry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน MOZART" @@ -4370,7 +4376,7 @@ MOZART" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -4382,7 +4388,7 @@ MOZART" KanitMediumTTF 0x322B26 showengText - "MOZART + "MOZART AMERICANO" @@ -4393,7 +4399,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -4612,7 +4618,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน WHISKY DUDE" @@ -4623,7 +4629,7 @@ WHISKY DUDE" KanitMediumTTF 0x6F5F51 showthaiText - "Washed Sherry cask ferment + "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" @@ -4635,7 +4641,7 @@ WHISKY DUDE" KanitMediumTTF 0x322B26 showengText - "WHISKY DUDE + "WHISKY DUDE AMERICANO" @@ -4646,7 +4652,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Washed Sherry cask ferment + "Washed Sherry cask ferment Note: Whisky & Vanilla" @@ -4865,7 +4871,7 @@ Note: Whisky & Vanilla" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน SNOWWHITE" @@ -4876,7 +4882,7 @@ SNOWWHITE" KanitMediumTTF 0x6F5F51 showthaiText - "Anaerobic process + "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" @@ -4888,7 +4894,7 @@ SNOWWHITE" KanitMediumTTF 0x322B26 showengText - "SNOWWHITE + "SNOWWHITE AMERICANO" @@ -4899,7 +4905,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Anaerobic process + "Anaerobic process Note: Jasmine & Honey" @@ -5118,7 +5124,7 @@ Note: Jasmine & Honey" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน PEACHER" @@ -5129,7 +5135,7 @@ PEACHER" KanitMediumTTF 0x6F5F51 showthaiText - "Barrel-aged process + "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" @@ -5141,7 +5147,7 @@ PEACHER" KanitMediumTTF 0x322B26 showengText - "PEACHER + "PEACHER AMERICANO" @@ -5152,7 +5158,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Barrel-aged process + "Barrel-aged process Note: Peach, tea, chocolate" @@ -5371,7 +5377,7 @@ Note: Peach, tea, chocolate" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน PURE BEAUTY" @@ -5382,7 +5388,7 @@ PURE BEAUTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" @@ -5394,7 +5400,7 @@ PURE BEAUTY" KanitMediumTTF 0x322B26 showengText - "PURE BEAUTY + "PURE BEAUTY AMERICANO" @@ -5623,7 +5629,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน GEISHA" @@ -5645,7 +5651,7 @@ GEISHA" KanitMediumTTF 0x322B26 showengText - "GEISHA + "GEISHA AMERICANO" @@ -5874,7 +5880,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน ROSALYN" @@ -5885,7 +5891,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" @@ -5897,7 +5903,7 @@ ROSALYN" KanitMediumTTF 0x322B26 showengText - "ROSALYN + "ROSALYN ROSALYN" @@ -5908,7 +5914,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showengText - "Light Roast (natural process) + "Light Roast (natural process) Pink​ Rose & Berry" @@ -6127,7 +6133,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x322B26 showthaiText - "BLUE DADDY + "BLUE DADDY ALMOST DIRTY" @@ -6138,7 +6144,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed process + "Washed process หอมบลูเบอร์รี และดอกไม้" @@ -6150,7 +6156,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "BLUE DADDY + "BLUE DADDY ALMOST DIRTY" @@ -6161,7 +6167,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Washed process + "Washed process Note: Blue Berry & Floral" @@ -6376,7 +6382,7 @@ Note: Blue Berry & Floral" KanitMediumTTF 0x322B26 showthaiText - "MOZART + "MOZART ALMOST DIRTY" @@ -6387,7 +6393,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -6399,7 +6405,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "MOZART + "MOZART ALMOST DIRTY" @@ -6410,7 +6416,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -6625,7 +6631,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "WHISKY DUDE + "WHISKY DUDE ALMOST DIRTY" @@ -6636,7 +6642,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed Sherry cask ferment + "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" @@ -6648,7 +6654,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "WHISKY DUDE + "WHISKY DUDE ALMOST DIRTY" @@ -6659,7 +6665,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Washed Sherry cask ferment + "Washed Sherry cask ferment Note: Whisky & Vanilla" @@ -6874,7 +6880,7 @@ Note: Whisky & Vanilla" KanitMediumTTF 0x322B26 showthaiText - "SNOWWHITE + "SNOWWHITE ALMOST DIRTY" @@ -6885,7 +6891,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Anaerobic process + "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" @@ -6897,7 +6903,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "SNOWWHITE + "SNOWWHITE ALMOST DIRTY" @@ -6908,7 +6914,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Anaerobic process + "Anaerobic process Note: Jasmine & Honey" @@ -7123,7 +7129,7 @@ Note: Jasmine & Honey" KanitMediumTTF 0x322B26 showthaiText - "QUEEN BERRY + "QUEEN BERRY ALMOST DIRTY" @@ -7134,7 +7140,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -7146,7 +7152,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "QUEEN BERRY + "QUEEN BERRY ALMOST DIRTY" @@ -7157,7 +7163,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Light roast natural process: + "Light roast natural process: Strawberry, Orange, Floral" @@ -7372,7 +7378,7 @@ Strawberry, Orange, Floral" KanitMediumTTF 0x322B26 showthaiText - "PEACHER + "PEACHER ALMOST DIRTY" @@ -7383,7 +7389,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "Barrel-aged process + "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" @@ -7395,7 +7401,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "PEACHER + "PEACHER ALMOST DIRTY" @@ -7406,7 +7412,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Barrel-aged process + "Barrel-aged process Note: Peach, tea, chocolate" @@ -7621,7 +7627,7 @@ Note: Peach, tea, chocolate" KanitMediumTTF 0x322B26 showthaiText - "PURE BEAUTY + "PURE BEAUTY ALMOST DIRTY" @@ -7632,7 +7638,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" @@ -7644,7 +7650,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "PURE BEAUTY + "PURE BEAUTY ALMOST DIRTY" @@ -7869,7 +7875,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showthaiText - "GEISHA + "GEISHA ALMOST DIRTY" @@ -7891,7 +7897,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "GEISHA + "GEISHA ALMOST DIRTY" @@ -8116,7 +8122,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showthaiText - "ROSALYN + "ROSALYN ALMOST DIRTY" @@ -8127,7 +8133,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" @@ -8139,7 +8145,7 @@ ALMOST DIRTY" KanitMediumTTF 0x322B26 showengText - "ROSALYN + "ROSALYN ALMOST DIRTY" @@ -8150,7 +8156,7 @@ ALMOST DIRTY" KanitMediumTTF 0x6F5F51 showengText - "Light Roast (natural process) + "Light Roast (natural process) Pink​ Rose & Berry" @@ -8386,7 +8392,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x322B26 showengText - "THAI + "THAI ICED ESPRESSO" @@ -9368,7 +9374,7 @@ ICED ESPRESSO" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม และ นม + "กาแฟ นม และ นม น้ำเชื่อมคาราเมล" @@ -9390,7 +9396,7 @@ ICED ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Caramel Syrup" @@ -9619,7 +9625,7 @@ Caramel Syrup" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ชาเขียวมัทฉะ + "กาแฟ นม ชาเขียวมัทฉะ และ นม" @@ -9631,7 +9637,7 @@ Caramel Syrup" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA CAFÉ LATTE" @@ -9870,7 +9876,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ชาเขียวมัทฉะ + "กาแฟ นม ชาเขียวมัทฉะ และ นม" @@ -9882,7 +9888,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA CAFÉ LATTE" @@ -10121,7 +10127,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ น้ำเชื่อมน้ำตาลแดง + "กาแฟ น้ำเชื่อมน้ำตาลแดง และ นม" @@ -10133,7 +10139,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "BROWN + "BROWN SUGAR LATTE" @@ -10144,7 +10150,7 @@ SUGAR LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Kokuto syrup" @@ -10373,7 +10379,7 @@ Kokuto syrup" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ เมล่อน น้ำตาล + "กาแฟ เมล่อน น้ำตาล และ นม" @@ -10385,7 +10391,7 @@ Kokuto syrup" KanitMediumTTF 0x322B26 showengText - "MELON + "MELON CAFÉ LATTE" @@ -10624,7 +10630,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ ชาไต้หวัน น้ำตาล + "กาแฟ ชาไต้หวัน น้ำตาล และ นม" @@ -10636,7 +10642,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA CAFÉ LATTE" @@ -10647,7 +10653,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Taiwanese Tea, + "Espresso, Taiwanese Tea, Milk, Sugar" @@ -10876,7 +10882,7 @@ Milk, Sugar" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ ชาไทย นม น้ำตาล + "กาแฟ ชาไทย นม น้ำตาล และ นม" @@ -10888,7 +10894,7 @@ Milk, Sugar" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA CAFÉ LATTE" @@ -11138,7 +11144,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA CAFÉ LATTE" @@ -11377,7 +11383,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ ชาไต้หวัน น้ำตาล + "กาแฟ ชาไต้หวัน น้ำตาล และ นม" @@ -11389,7 +11395,7 @@ CAFÉ LATTE" KanitMediumTTF 0x322B26 showengText - "TAIWANESE TEA + "TAIWANESE TEA CAFÉ LATTE" @@ -11400,7 +11406,7 @@ CAFÉ LATTE" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Taiwanese Tea, + "Espresso, Taiwanese Tea, Milk, Sugar" @@ -11640,7 +11646,7 @@ Milk, Sugar" KanitMediumTTF 0x322B26 showengText - "LYCHEE + "LYCHEE AMERICANO" @@ -11651,7 +11657,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Lychee, + "Espresso, Lychee, Sugar, Water" @@ -11891,7 +11897,7 @@ Sugar, Water" KanitMediumTTF 0x322B26 showengText - "LYCHEE + "LYCHEE AMERICANO" @@ -11902,7 +11908,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Lychee, + "Espresso, Lychee, Sugar, Water" @@ -12142,7 +12148,7 @@ Sugar, Water" KanitMediumTTF 0x322B26 showengText - "YUZU + "YUZU AMERICANO" @@ -12153,7 +12159,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Yuzu, + "Espresso, Yuzu, Sugar, Water" @@ -12300,8 +12306,8 @@ Sugar, Water" Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - + + + + + diff --git a/xml/page_catalog_group_forkid.xml b/xml/page_catalog_group_forkid.xml index 49b7ede5..93887131 100644 --- a/xml/page_catalog_group_forkid.xml +++ b/xml/page_catalog_group_forkid.xml @@ -1,503 +1,509 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - 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 " - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - 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 - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - - Var Menu22Selected = "Enable" - - - ; protein - If AppFastEnable = "true" Then - Var Menu11Selected = "PressForever" - Var Menu7Selected = "Invisible" - Var Menu21Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu7Selected = "Invisible" - Var Menu21Selected = "PressForever" - EndIf - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + 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 " + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + 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 + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + + Var Menu22Selected = "Enable" + + + ; protein + If AppFastEnable = "true" Then + Var Menu11Selected = "PressForever" + Var Menu7Selected = "Invisible" + Var Menu21Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu7Selected = "Invisible" + Var Menu21Selected = "PressForever" + EndIf + + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + SAVELOG "COA9" + Open NextPage + EndIf + Else + If Timeout > 30 Then + SAVELOG "COA30" + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + SAVELOG "Timeout" + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + SAVELOG "Back" + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + If Seeker = "curr" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var EmergencyStop = "true" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + EndIf + EndIf + + If IgnoreNetCore = "true" Then + + Else + ;stop_now + If NETCORE_LOST_CNT > 120 Then + Var stop_now = "true" + Var MachineErrorDetailAll = "???" + SAVELOG "NETCORE_LOST_CNT" + + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + EndIf + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + +; + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + 10 497 @@ -1115,7 +1121,7 @@ KanitMediumTTF 0x322B26 showengText - "BROWN SUGAR + "BROWN SUGAR MILK" @@ -1354,7 +1360,7 @@ MILK" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำแดงกลิ่นสละ นม + "น้ำแดงกลิ่นสละ นม น้ำตาล " @@ -2098,7 +2104,7 @@ MILK" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำเชื่อมสตอเบอร์รี่ + "นม น้ำเชื่อมสตอเบอร์รี่ โกโก้ และน้ำแข็ง" @@ -2110,7 +2116,7 @@ MILK" KanitMediumTTF 0x322B26 showengText - "STRAWCOCOA + "STRAWCOCOA SMOOTHIE" @@ -2356,7 +2362,7 @@ SMOOTHIE" KanitMediumTTF 0x322B26 showengText - "OVALTINE SMOOTHIE + "OVALTINE SMOOTHIE VOLCANO" @@ -2602,7 +2608,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "COCOA OVALTINE + "COCOA OVALTINE VOLCANO" @@ -3327,7 +3333,7 @@ VOLCANO" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมเมล่อน โซดา + "น้ำเชื่อมเมล่อน โซดา และน้ำแข็ง" @@ -3573,7 +3579,7 @@ VOLCANO" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมยูซุ โซดา + "น้ำเชื่อมยูซุ โซดา และน้ำแข็ง" @@ -3737,7 +3743,7 @@ VOLCANO" Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - + + + + diff --git a/xml/page_catalog_group_health.xml b/xml/page_catalog_group_health.xml index 9f532dba..8f9460c6 100644 --- a/xml/page_catalog_group_health.xml +++ b/xml/page_catalog_group_health.xml @@ -1,494 +1,500 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - 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 " - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - 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 - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - - Var Menu22Selected = "Enable" - - - Var Menu22Selected = "PressForever" - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + 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 " + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + 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 + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + + Var Menu22Selected = "Enable" + + + Var Menu22Selected = "PressForever" + + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + SAVELOG "COA9" + Open NextPage + EndIf + Else + If Timeout > 30 Then + SAVELOG "COA30" + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + SAVELOG "Timeout" + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + SAVELOG "Back" + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + If Seeker = "curr" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var EmergencyStop = "true" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + EndIf + EndIf + + If IgnoreNetCore = "true" Then + + Else + ;stop_now + If NETCORE_LOST_CNT > 120 Then + Var stop_now = "true" + Var MachineErrorDetailAll = "???" + SAVELOG "NETCORE_LOST_CNT" + + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + EndIf + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + +; + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + 10 497 @@ -587,7 +593,7 @@ KanitMediumTTF 0x322B26 showthaiText - "กาแฟดำ + "กาแฟดำ (อเมริกาโน)" @@ -598,7 +604,7 @@ KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ และน้ำร้อน + "กาแฟ และน้ำร้อน (อเมริกาโน)" @@ -869,7 +875,7 @@ KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Foamed milk" @@ -1098,7 +1104,7 @@ Foamed milk" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟ นม ผสมช็อกโกแลต + "กาแฟ นม ผสมช็อกโกแลต น้ำตาล" @@ -1120,7 +1126,7 @@ Foamed milk" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Cocoa, + "Espresso, Cocoa, Milk, Sugar" @@ -1370,7 +1376,7 @@ Milk, Sugar" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, Foamed milk" @@ -1859,7 +1865,7 @@ Foamed milk" KanitMediumTTF 0x322B26 showengText - "TAIWANESE + "TAIWANESE MILK TEA" @@ -1870,7 +1876,7 @@ MILK TEA" KanitMediumTTF 0x6F5F51 showengText - "Taiwanese Tea, Sugar, + "Taiwanese Tea, Sugar, and Milk" @@ -2857,7 +2863,7 @@ and Milk" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA LIMENADE" @@ -3335,7 +3341,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showthaiText - "ชาดำไต้หวัน + "ชาดำไต้หวัน มะนาว" @@ -3357,7 +3363,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showengText - "TAIWANESE + "TAIWANESE LBLACK TEA" @@ -3368,7 +3374,7 @@ LBLACK TEA" KanitMediumTTF 0x6F5F51 showengText - "Taiwan tea, Limenade, + "Taiwan tea, Limenade, Water, and Ice" @@ -4604,7 +4610,7 @@ Water, and Ice" KanitMediumTTF 0x322B26 showengText - "ICED LIMENADE + "ICED LIMENADE SODA" @@ -4757,7 +4763,7 @@ SODA" Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - + + + + diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml index 7f88fb7e..c620e57c 100644 --- a/xml/page_catalog_group_milk.xml +++ b/xml/page_catalog_group_milk.xml @@ -1,491 +1,497 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - 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 " - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - 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 - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - - Var Menu22Selected = "Enable" - - - Var Menu4Selected = "PressForever" - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + 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 " + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + 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 + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + + Var Menu22Selected = "Enable" + + + Var Menu4Selected = "PressForever" + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + SAVELOG "COA9" + Open NextPage + EndIf + Else + If Timeout > 30 Then + SAVELOG "COA30" + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + SAVELOG "Timeout" + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + SAVELOG "Back" + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + If Seeker = "curr" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var EmergencyStop = "true" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + EndIf + EndIf + + If IgnoreNetCore = "true" Then + + Else + ;stop_now + If NETCORE_LOST_CNT > 120 Then + Var stop_now = "true" + Var MachineErrorDetailAll = "???" + SAVELOG "NETCORE_LOST_CNT" + + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + EndIf + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + +; + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + 10 497 @@ -1092,7 +1098,7 @@ KanitMediumTTF 0x6F5F51 showthaiText - "โกโก้ นม น้ำตาล + "โกโก้ นม น้ำตาล น้ำเชื่อมคาราเมล" @@ -1114,7 +1120,7 @@ KanitMediumTTF 0x6F5F51 showengText - "Cocoa, Milk,Sugar, + "Cocoa, Milk,Sugar, Caramel Syrup" @@ -1354,7 +1360,7 @@ Caramel Syrup" KanitMediumTTF 0x322B26 showengText - "BROWN SUGAR + "BROWN SUGAR MILK" @@ -1593,7 +1599,7 @@ MILK" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำแดงกลิ่นสละ นม + "น้ำแดงกลิ่นสละ นม น้ำตาล " @@ -2088,7 +2094,7 @@ MILK" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำเชื่อมสตอเบอร์รี่ + "นม น้ำเชื่อมสตอเบอร์รี่ โกโก้ และน้ำแข็ง" @@ -2100,7 +2106,7 @@ MILK" KanitMediumTTF 0x322B26 showengText - "STRAWCOCOA + "STRAWCOCOA SMOOTHIE" @@ -2335,7 +2341,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำเชื่อมสตอเบอร์รี่ + "นม น้ำเชื่อมสตอเบอร์รี่ และน้ำแข็ง" @@ -2347,7 +2353,7 @@ SMOOTHIE" KanitMediumTTF 0x322B26 showengText - "STRAWMILK + "STRAWMILK SMOOTHIE" @@ -2582,7 +2588,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำตาล โอริโอ้ + "นม น้ำตาล โอริโอ้ " @@ -2594,7 +2600,7 @@ SMOOTHIE" KanitMediumTTF 0x322B26 showengText - "OREO SMOOTHIE + "OREO SMOOTHIE VOLCANO" @@ -3089,7 +3095,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "OVALTINE SMOOTHIE + "OVALTINE SMOOTHIE VOLCANO" @@ -3335,7 +3341,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "COCOA OVALTINE + "COCOA OVALTINE VOLCANO" @@ -3986,7 +3992,7 @@ VOLCANO" Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - + + + + diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml index 64059314..75abf847 100644 --- a/xml/page_catalog_group_other.xml +++ b/xml/page_catalog_group_other.xml @@ -1,493 +1,499 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - 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 " - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - 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 - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - - Var Menu22Selected = "Enable" - - - ; soda and other - Var Menu6Selected = "PressForever" - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + 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 " + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + 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 + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + + Var Menu22Selected = "Enable" + + + ; soda and other + Var Menu6Selected = "PressForever" + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + SAVELOG "COA9" + Open NextPage + EndIf + Else + If Timeout > 30 Then + SAVELOG "COA30" + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + SAVELOG "Timeout" + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + SAVELOG "Back" + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + If Seeker = "curr" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var EmergencyStop = "true" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + EndIf + EndIf + + If IgnoreNetCore = "true" Then + + Else + ;stop_now + If NETCORE_LOST_CNT > 120 Then + Var stop_now = "true" + Var MachineErrorDetailAll = "???" + SAVELOG "NETCORE_LOST_CNT" + + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + EndIf + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + +; + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + 10 497 @@ -1331,7 +1337,7 @@ KanitMediumTTF 0x6F5F51 showthaiText - "เครื่องดื่มเต่าทรงพลัง โซดา + "เครื่องดื่มเต่าทรงพลัง โซดา (มีคาเฟอีน)" @@ -1343,7 +1349,7 @@ KanitMediumTTF 0x322B26 showengText - "TAO POWER + "TAO POWER DRINK SODA" @@ -1578,7 +1584,7 @@ DRINK SODA" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมเมล่อน โซดา + "น้ำเชื่อมเมล่อน โซดา และน้ำแข็ง" @@ -1824,7 +1830,7 @@ DRINK SODA" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมยูซุ โซดา + "น้ำเชื่อมยูซุ โซดา และน้ำแข็ง" @@ -2081,7 +2087,7 @@ DRINK SODA" KanitMediumTTF 0x322B26 showengText - "LIMENADE + "LIMENADE SODA" @@ -2806,7 +2812,7 @@ SODA" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมสตอเบอร์รี่ มะนาว + "น้ำเชื่อมสตอเบอร์รี่ มะนาว โซดา " @@ -2818,7 +2824,7 @@ SODA" KanitMediumTTF 0x322B26 showengText - "LYCHEE + "LYCHEE LIMENADE SODA" @@ -2829,7 +2835,7 @@ LIMENADE SODA" KanitMediumTTF 0x6F5F51 showengText - "Strawberry Syrup, + "Strawberry Syrup, Limenade, Soda & Ice" @@ -3054,7 +3060,7 @@ Limenade, Soda & Ice" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมกัญชา โซดา + "น้ำเชื่อมกัญชา โซดา (อายุมากกว่า 20+ เท่านั้น)" @@ -3300,7 +3306,7 @@ Limenade, Soda & Ice" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมกัญชา มะนาว โซดา + "น้ำเชื่อมกัญชา มะนาว โซดา (อายุ 20+ เท่านั้น)" @@ -3312,7 +3318,7 @@ Limenade, Soda & Ice" KanitMediumTTF 0x322B26 showengText - "LIMENADE + "LIMENADE CANNABIS SODA" @@ -3323,7 +3329,7 @@ CANNABIS SODA" KanitMediumTTF 0x6F5F51 showengText - "Cannabis Syrup, Limenade, + "Cannabis Syrup, Limenade, Soda & Ice" @@ -4294,7 +4300,7 @@ Soda & Ice" KanitMediumTTF 0x322B26 showengText - "LIME + "LIME SALAK SODA" @@ -4305,7 +4311,7 @@ SALAK SODA" KanitMediumTTF 0x6F5F51 showengText - "Salak Syrup, Limenade, + "Salak Syrup, Limenade, Soda & Ice" @@ -4775,7 +4781,7 @@ Soda & Ice" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมบ๊วย มะนาว โซดา + "น้ำเชื่อมบ๊วย มะนาว โซดา " @@ -4787,7 +4793,7 @@ Soda & Ice" KanitMediumTTF 0x322B26 showengText - "PLUM + "PLUM LIMENADE SODA" @@ -4798,7 +4804,7 @@ LIMENADE SODA" KanitMediumTTF 0x6F5F51 showengText - "Ume Syrup, Limenade, + "Ume Syrup, Limenade, Soda & Ice" @@ -5769,7 +5775,7 @@ Soda & Ice" KanitMediumTTF 0x322B26 showengText - "GINGER LIME + "GINGER LIME SODA" @@ -6494,7 +6500,7 @@ SODA" KanitMediumTTF 0x6F5F51 showthaiText - "เครื่องดื่มเต่าทรงพลัง + "เครื่องดื่มเต่าทรงพลัง (มีคาเฟอีน)" @@ -6740,7 +6746,7 @@ SODA" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำแดงกลิ่นสละ น้ำมะนาว + "น้ำแดงกลิ่นสละ น้ำมะนาว " @@ -6762,7 +6768,7 @@ SODA" KanitMediumTTF 0x6F5F51 showengText - "Salak Syrup, Limenade, + "Salak Syrup, Limenade, Water & Ice" @@ -7008,7 +7014,7 @@ Water & Ice" KanitMediumTTF 0x6F5F51 showengText - "Lychee Syrup, Sugar, + "Lychee Syrup, Sugar, Water & Ice" @@ -7233,7 +7239,7 @@ Water & Ice" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำแดงกลิ่นสละ + "น้ำแดงกลิ่นสละ " @@ -7479,7 +7485,7 @@ Water & Ice" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมสตอเบอร์รี่ น้ำ + "น้ำเชื่อมสตอเบอร์รี่ น้ำ " @@ -7501,7 +7507,7 @@ Water & Ice" KanitMediumTTF 0x6F5F51 showengText - "Strawberry Syrup, + "Strawberry Syrup, Water & Ice" @@ -8241,7 +8247,7 @@ Water & Ice" KanitMediumTTF 0x6F5F51 showengText - "Lychee Syrup, Sugar, + "Lychee Syrup, Sugar, Water & Ice" @@ -8487,7 +8493,7 @@ Water & Ice" KanitMediumTTF 0x6F5F51 showengText - "Strawberry Syrup, + "Strawberry Syrup, Water, Ice" @@ -8723,7 +8729,7 @@ Water, Ice" KanitMediumTTF 0x322B26 showengText - "CONGEE WITH + "CONGEE WITH PLANT PROTEIN" @@ -9619,7 +9625,7 @@ PLANT PROTEIN" Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - + + + + diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index 8b895216..b3c2faf9 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -1,498 +1,504 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - 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 " - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - 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 - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - - Var Menu22Selected = "Enable" - - - Var Menu1Selected = "PressForever" - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - If show_eng = "true" Then - - Var text_unavailable = "UNAVAILABLE###size=16" - Else - Var text_unavailable = "หมด###size=32" - - EndIf - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + 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 " + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + 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 + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + + Var Menu22Selected = "Enable" + + + Var Menu1Selected = "PressForever" + + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + If show_eng = "true" Then + + Var text_unavailable = "UNAVAILABLE###size=16" + Else + Var text_unavailable = "หมด###size=32" + + EndIf + + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + SAVELOG "COA9" + Open NextPage + EndIf + Else + If Timeout > 30 Then + SAVELOG "COA30" + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + SAVELOG "Timeout" + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + SAVELOG "Back" + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + If Seeker = "curr" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var EmergencyStop = "true" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + EndIf + EndIf + + If IgnoreNetCore = "true" Then + + Else + ;stop_now + If NETCORE_LOST_CNT > 120 Then + Var stop_now = "true" + Var MachineErrorDetailAll = "???" + SAVELOG "NETCORE_LOST_CNT" + + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + EndIf + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + +; + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + 16 10 @@ -648,7 +654,7 @@ KanitMediumTTF 0x322B26 showengText - "CONGEE WITH + "CONGEE WITH PLANT PROTEIN" @@ -1375,7 +1381,7 @@ PLANT PROTEIN" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต Guji Queen Berry" @@ -1386,7 +1392,7 @@ Guji Queen Berry" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -1398,7 +1404,7 @@ Guji Queen Berry" KanitMediumTTF 0x322B26 showengText - "ESPRESSO + "ESPRESSO ETHIOPAI GUJI" @@ -1409,7 +1415,7 @@ ETHIOPAI GUJI" KanitMediumTTF 0x6F5F51 showengText - "Light roast natural process: + "Light roast natural process: Strawberry, Orange, Floral" @@ -1628,7 +1634,7 @@ Strawberry, Orange, Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต BLUE DADDY" @@ -1639,7 +1645,7 @@ BLUE DADDY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed process + "Washed process หอมบลูเบอร์รี และดอกไม้" @@ -1651,7 +1657,7 @@ BLUE DADDY" KanitMediumTTF 0x322B26 showengText - "BLUE DADDY + "BLUE DADDY ESPRESSO" @@ -1662,7 +1668,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Washed process + "Washed process Note: Blue Berry & Floral" @@ -1881,7 +1887,7 @@ Note: Blue Berry & Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต MOZART " @@ -1892,7 +1898,7 @@ MOZART " KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -1904,7 +1910,7 @@ MOZART " KanitMediumTTF 0x322B26 showengText - "MOZART + "MOZART ESPRESSO" @@ -1915,7 +1921,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -2134,7 +2140,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต SNOWWHITE" @@ -2145,7 +2151,7 @@ SNOWWHITE" KanitMediumTTF 0x6F5F51 showthaiText - "Anaerobic process + "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" @@ -2157,7 +2163,7 @@ SNOWWHITE" KanitMediumTTF 0x322B26 showengText - "SNOWWHITE + "SNOWWHITE ESPRESSO" @@ -2168,7 +2174,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Anaerobic process + "Anaerobic process Note: Jasmine & Honey" @@ -2387,7 +2393,7 @@ Note: Jasmine & Honey" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต WHISKY DUDE" @@ -2398,7 +2404,7 @@ WHISKY DUDE" KanitMediumTTF 0x6F5F51 showthaiText - "Washed Sherry cask ferment + "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" @@ -2410,7 +2416,7 @@ WHISKY DUDE" KanitMediumTTF 0x322B26 showengText - "WHISKY DUDE + "WHISKY DUDE ESPRESSO" @@ -2421,7 +2427,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Washed Sherry cask ferment + "Washed Sherry cask ferment Note: Whisky & Vanilla" @@ -2640,7 +2646,7 @@ Note: Whisky & Vanilla" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต PEACHER" @@ -2651,7 +2657,7 @@ PEACHER" KanitMediumTTF 0x6F5F51 showthaiText - "Barrel-aged process + "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" @@ -2663,7 +2669,7 @@ PEACHER" KanitMediumTTF 0x322B26 showengText - "PEACHER + "PEACHER ESPRESSO" @@ -2674,7 +2680,7 @@ ESPRESSO" KanitMediumTTF 0x6F5F51 showengText - "Barrel-aged process + "Barrel-aged process Note: Peach, tea, chocolate" @@ -2893,7 +2899,7 @@ Note: Peach, tea, chocolate" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต PURE BEAUTY" @@ -2904,7 +2910,7 @@ PURE BEAUTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" @@ -2916,7 +2922,7 @@ PURE BEAUTY" KanitMediumTTF 0x322B26 showengText - "PURE BEAUTY + "PURE BEAUTY ESPRESSO" @@ -3145,7 +3151,7 @@ ESPRESSO" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต GEISHA" @@ -3395,7 +3401,7 @@ GEISHA" KanitMediumTTF 0x322B26 showthaiText - "เอสเพรสโซ่ช็อต + "เอสเพรสโซ่ช็อต ROSALYN" @@ -3406,7 +3412,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" @@ -3428,7 +3434,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showengText - "Light Roast (natural process) + "Light Roast (natural process) Pink​ Rose & Berry" @@ -3647,7 +3653,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน Guji Queen Berry" @@ -3658,7 +3664,7 @@ Guji Queen Berry" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -3670,7 +3676,7 @@ Guji Queen Berry" KanitMediumTTF 0x322B26 showengText - "AMERICANO + "AMERICANO ETHIOPAI GUJI" @@ -3681,7 +3687,7 @@ ETHIOPAI GUJI" KanitMediumTTF 0x6F5F51 showengText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" @@ -3900,7 +3906,7 @@ ETHIOPAI GUJI" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน BLUE DADDY" @@ -3911,7 +3917,7 @@ BLUE DADDY" KanitMediumTTF 0x6F5F51 showthaiText - "Washed process + "Washed process หอมบลูเบอร์รี และดอกไม้" @@ -3923,7 +3929,7 @@ BLUE DADDY" KanitMediumTTF 0x322B26 showengText - "BLUE DADDY + "BLUE DADDY AMERICANO" @@ -3934,7 +3940,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Washed process + "Washed process Note: Blue Berry & Floral" @@ -4153,7 +4159,7 @@ Note: Blue Berry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน MOZART" @@ -4164,7 +4170,7 @@ MOZART" KanitMediumTTF 0x6F5F51 showthaiText - "Raisin Honey process + "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" @@ -4176,7 +4182,7 @@ MOZART" KanitMediumTTF 0x322B26 showengText - "MOZART + "MOZART AMERICANO" @@ -4187,7 +4193,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Raisin Honey process + "Raisin Honey process Note: Strawberry & Floral" @@ -4406,7 +4412,7 @@ Note: Strawberry & Floral" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน WHISKY DUDE" @@ -4417,7 +4423,7 @@ WHISKY DUDE" KanitMediumTTF 0x6F5F51 showthaiText - "Washed Sherry cask ferment + "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" @@ -4429,7 +4435,7 @@ WHISKY DUDE" KanitMediumTTF 0x322B26 showengText - "WHISKY DUDE + "WHISKY DUDE AMERICANO" @@ -4440,7 +4446,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Washed Sherry cask ferment + "Washed Sherry cask ferment Note: Whisky & Vanilla" @@ -4659,7 +4665,7 @@ Note: Whisky & Vanilla" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน SNOWWHITE" @@ -4670,7 +4676,7 @@ SNOWWHITE" KanitMediumTTF 0x6F5F51 showthaiText - "Anaerobic process + "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" @@ -4682,7 +4688,7 @@ SNOWWHITE" KanitMediumTTF 0x322B26 showengText - "SNOWWHITE + "SNOWWHITE AMERICANO" @@ -4693,7 +4699,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Anaerobic process + "Anaerobic process Note: Jasmine & Honey" @@ -4912,7 +4918,7 @@ Note: Jasmine & Honey" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน PEACHER" @@ -4923,7 +4929,7 @@ PEACHER" KanitMediumTTF 0x6F5F51 showthaiText - "Barrel-aged process + "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" @@ -4935,7 +4941,7 @@ PEACHER" KanitMediumTTF 0x322B26 showengText - "PEACHER + "PEACHER AMERICANO" @@ -4946,7 +4952,7 @@ AMERICANO" KanitMediumTTF 0x6F5F51 showengText - "Barrel-aged process + "Barrel-aged process Note: Peach, tea, chocolate" @@ -5165,7 +5171,7 @@ Note: Peach, tea, chocolate" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน PURE BEAUTY" @@ -5176,7 +5182,7 @@ PURE BEAUTY" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (natural process) + "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" @@ -5188,7 +5194,7 @@ PURE BEAUTY" KanitMediumTTF 0x322B26 showengText - "PURE BEAUTY + "PURE BEAUTY AMERICANO" @@ -5417,7 +5423,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน GEISHA" @@ -5439,7 +5445,7 @@ GEISHA" KanitMediumTTF 0x322B26 showengText - "GEISHA + "GEISHA AMERICANO" @@ -5668,7 +5674,7 @@ AMERICANO" KanitMediumTTF 0x322B26 showthaiText - "อเมริกาโน + "อเมริกาโน ROSALYN" @@ -5679,7 +5685,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showthaiText - "กาแฟคั่วอ่อน (washed process) + "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" @@ -5691,7 +5697,7 @@ ROSALYN" KanitMediumTTF 0x322B26 showengText - "ROSALYN + "ROSALYN ROSALYN" @@ -5702,7 +5708,7 @@ ROSALYN" KanitMediumTTF 0x6F5F51 showengText - "Light Roast (natural process) + "Light Roast (natural process) Pink​ Rose & Berry" @@ -5952,7 +5958,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x6F5F51 showengText - "Espresso, Milk, + "Espresso, Milk, milk" @@ -7426,7 +7432,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำแดงกลิ่นสละ นม + "น้ำแดงกลิ่นสละ นม น้ำตาล " @@ -7448,7 +7454,7 @@ Pink​ Rose & Berry" KanitMediumTTF 0x6F5F51 showengText - "Salak Syrup, Milk, + "Salak Syrup, Milk, Sugar" @@ -7673,7 +7679,7 @@ Sugar" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำเชื่อมสตอเบอร์รี่ + "นม น้ำเชื่อมสตอเบอร์รี่ และน้ำแข็ง" @@ -7685,7 +7691,7 @@ Sugar" KanitMediumTTF 0x322B26 showengText - "STRAWMILK + "STRAWMILK SMOOTHIE" @@ -8169,7 +8175,7 @@ SMOOTHIE" KanitMediumTTF 0x6F5F51 showthaiText - "นม น้ำตาล โอริโอ้ + "นม น้ำตาล โอริโอ้ " @@ -8181,7 +8187,7 @@ SMOOTHIE" KanitMediumTTF 0x322B26 showengText - "OREO SMOOTHIE + "OREO SMOOTHIE VOLCANO" @@ -8427,7 +8433,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "OVALTINE SMOOTHIE + "OVALTINE SMOOTHIE VOLCANO" @@ -9163,7 +9169,7 @@ VOLCANO" KanitMediumTTF 0x322B26 showengText - "TAO POWER + "TAO POWER DRINK SODA" @@ -9398,7 +9404,7 @@ DRINK SODA" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมบ๊วย มะนาว โซดา + "น้ำเชื่อมบ๊วย มะนาว โซดา " @@ -9410,7 +9416,7 @@ DRINK SODA" KanitMediumTTF 0x322B26 showengText - "PLUM + "PLUM LIMENADE SODA" @@ -9563,24 +9569,24 @@ LIMENADE SODA" Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - - - - + + + + + + + + + diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml index e33c6aee..a404fded 100644 --- a/xml/page_catalog_group_tea.xml +++ b/xml/page_catalog_group_tea.xml @@ -1,493 +1,499 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - 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 " - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - 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 - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - - Var Menu22Selected = "Enable" - - - Var Menu3Selected = "PressForever" - - - SAVELOG PreviseXMLFileName2 - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;DEBUGVAR ICE_PROCESS_STATUS - - If ICE_PROCESS_STATUS = 2 Then - Var ice_tab_process_show = "Enable" - Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT - Else - Var ice_tab_process_show = "Invisible" - EndIf - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -; - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + 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 " + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + 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 + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + + Var Menu22Selected = "Enable" + + + Var Menu3Selected = "PressForever" + + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + 1000 + + ;DEBUGVAR ICE_PROCESS_STATUS + + If ICE_PROCESS_STATUS = 2 Then + Var ice_tab_process_show = "Enable" + Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT + Else + Var ice_tab_process_show = "Invisible" + EndIf + + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + SAVELOG "COA9" + Open NextPage + EndIf + Else + If Timeout > 30 Then + SAVELOG "COA30" + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + SAVELOG "Timeout" + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + SAVELOG "Back" + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + If Seeker = "curr" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var EmergencyStop = "true" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + EndIf + EndIf + + If IgnoreNetCore = "true" Then + + Else + ;stop_now + If NETCORE_LOST_CNT > 120 Then + Var stop_now = "true" + Var MachineErrorDetailAll = "???" + SAVELOG "NETCORE_LOST_CNT" + + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + EndIf + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + +; + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + 10 497 @@ -1852,7 +1858,7 @@ KanitMediumTTF 0x322B26 showengText - "LIME + "LIME GINGER TEA" @@ -3824,7 +3830,7 @@ GINGER TEA" KanitMediumTTF 0x322B26 showthaiText - "ชาเขียวญี่ปุ่นมะนาว + "ชาเขียวญี่ปุ่นมะนาว " @@ -3846,7 +3852,7 @@ GINGER TEA" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA LIMENADE" @@ -4324,7 +4330,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showthaiText - "ชาเขียวญี่ปุ่นมะนาว + "ชาเขียวญี่ปุ่นมะนาว " @@ -4346,7 +4352,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showengText - "MATCHA + "MATCHA LIMENADE" @@ -4834,7 +4840,7 @@ LIMENADE" KanitMediumTTF 0x6F5F51 showthaiText - "ชาไทย น้ำเชื่อมน้ำตาลแดง + "ชาไทย น้ำเชื่อมน้ำตาลแดง นม " @@ -4846,7 +4852,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showengText - "BROWN SUGAR + "BROWN SUGAR TEA" @@ -5583,7 +5589,7 @@ TEA" KanitMediumTTF 0x6F5F51 showthaiText - "ชาไทย น้ำเชื่อมสตอเบอร์รี่ + "ชาไทย น้ำเชื่อมสตอเบอร์รี่ " @@ -5605,7 +5611,7 @@ TEA" KanitMediumTTF 0x6F5F51 showengText - "Thai tea, Strawberry Syrup, + "Thai tea, Strawberry Syrup, Water" @@ -5834,7 +5840,7 @@ Water" KanitMediumTTF 0x6F5F51 showthaiText - "ชาไทย น้ำเชื่อมสตอเบอร์รี่ + "ชาไทย น้ำเชื่อมสตอเบอร์รี่ " @@ -5856,7 +5862,7 @@ Water" KanitMediumTTF 0x6F5F51 showengText - "Thai tea, Strawberry Syrup, + "Thai tea, Strawberry Syrup, Water" @@ -6594,7 +6600,7 @@ Water" KanitMediumTTF 0x322B26 showengText - "THAI TEA + "THAI TEA LIMENADE" @@ -6844,7 +6850,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showengText - "TAIWANESE + "TAIWANESE BLACK TEA" @@ -7094,7 +7100,7 @@ LIMENADE" KanitMediumTTF 0x322B26 showengText - "TAIWANESE + "TAIWANESE LIME TEA" @@ -7105,7 +7111,7 @@ LIME TEA" KanitMediumTTF 0x6F5F51 showengText - "Taiwanese tea, Limenade, + "Taiwanese tea, Limenade, Water" @@ -7252,7 +7258,7 @@ Water" Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - + + + + diff --git a/xml/page_catalog_with_vending.xml b/xml/page_catalog_with_vending.xml index f519f3f3..2a3cceb4 100644 --- a/xml/page_catalog_with_vending.xml +++ b/xml/page_catalog_with_vending.xml @@ -8,6 +8,10 @@ TopView "show" ; On open + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_catalog.xml" + EndIf + Var NextPage = "-" Var Seeker.thankLidFlag = 0 diff --git a/xml/page_check_member.xml b/xml/page_check_member.xml index 7ada4a0d..14ce93d7 100644 --- a/xml/page_check_member.xml +++ b/xml/page_check_member.xml @@ -15,6 +15,7 @@ Var ShowTextNumber = "Enable" Var ShowErrorText = "Invisible" + Var ShowErrorText2 = "Invisible" Var Tel_Confirm_State = "Invisible" Var GetCreditFlag = 0 @@ -186,13 +187,16 @@ Var TelephoneNumber = TelephoneNumber + "1" Var ShowTextNumber = "Invisible" Trim TelephoneNumber 10 - TimerReset - Refresh + StrLen TelephoneNumber TelNumLen If TelNumLen >= 10 Then Var Tel_Confirm_State = "Enable" EndIf Var ShowErrorText = "Invisible" + Var ShowErrorText2 = "Invisible" + + TimerReset + Refresh If TelNumLen = 7 Then Var number7 = "1" @@ -232,6 +236,10 @@ Var Tel_Confirm_State = "Enable" EndIf Var ShowErrorText = "Invisible" + Var ShowErrorText2 = "Invisible" + + TimerReset + Refresh If TelNumLen = 7 Then Var number7 = "2" @@ -271,6 +279,10 @@ Var Tel_Confirm_State = "Enable" EndIf Var ShowErrorText = "Invisible" + Var ShowErrorText2 = "Invisible" + + TimerReset + Refresh If TelNumLen = 7 Then Var number7 = "3" @@ -310,6 +322,10 @@ Var Tel_Confirm_State = "Enable" EndIf Var ShowErrorText = "Invisible" + Var ShowErrorText2 = "Invisible" + + TimerReset + Refresh If TelNumLen = 7 Then Var number7 = "4" @@ -349,6 +365,10 @@ Var Tel_Confirm_State = "Enable" EndIf Var ShowErrorText = "Invisible" + Var ShowErrorText2 = "Invisible" + + TimerReset + Refresh If TelNumLen = 7 Then Var number7 = "5" @@ -388,6 +408,10 @@ Var Tel_Confirm_State = "Enable" EndIf Var ShowErrorText = "Invisible" + Var ShowErrorText2 = "Invisible" + + TimerReset + Refresh If TelNumLen = 7 Then Var number7 = "6" @@ -427,6 +451,10 @@ Var Tel_Confirm_State = "Enable" EndIf Var ShowErrorText = "Invisible" + Var ShowErrorText2 = "Invisible" + + TimerReset + Refresh If TelNumLen = 7 Then Var number7 = "7" @@ -466,6 +494,10 @@ Var Tel_Confirm_State = "Enable" EndIf Var ShowErrorText = "Invisible" + Var ShowErrorText2 = "Invisible" + + TimerReset + Refresh If TelNumLen = 7 Then Var number7 = "8" @@ -504,6 +536,10 @@ Var Tel_Confirm_State = "Enable" EndIf Var ShowErrorText = "Invisible" + Var ShowErrorText2 = "Invisible" + + TimerReset + Refresh If TelNumLen = 7 Then Var number7 = "9" @@ -544,6 +580,10 @@ TimerReset Refresh Var ShowErrorText = "Invisible" + Var ShowErrorText2 = "Invisible" + + TimerReset + Refresh If TelNumLen = 7 Then Var number7 = "0" @@ -583,6 +623,7 @@ EndIf ;Var ShowErrorText = "Invisible" + Var ShowErrorText2 = "Invisible" TimerReset Refresh @@ -621,8 +662,37 @@ SoundVolume - ;GETACCEXT TelephoneNumber 14 - GETACCEXT TelephoneNumber 19 + DEBUGVAR "PICHET" + + Var Tel2DFlag = 0 + + Var Tel2D = TelephoneNumber + Trim Tel2D 2 + + If Tel2D = "06" Then + Var Tel2DFlag = 1 + EndIf + If Tel2D = "07" Then + Var Tel2DFlag = 1 + EndIf + If Tel2D = "08" Then + Var Tel2DFlag = 1 + EndIf + If Tel2D = "09" Then + Var Tel2DFlag = 1 + EndIf + + If Tel2DFlag = 1 Then + + GETACCEXT TelephoneNumber 19 + Else + + Var ShowErrorText2 = "Enable" + ;Var TelephoneNumber = "" + Var Tel_Confirm_State = "Invisible" + Refresh + + EndIf @@ -677,7 +747,15 @@ 942 ShowErrorText "Enable" - "ROOT/taobin_project/image/collectiing/text_show_notfound.png" + Var( DirImage + "/text_show_notfound.png") + + + + 152 + 910 + ShowErrorText2 + "Enable" + Var( DirImage + "/text_show_error5.png") diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index 775a13a2..efb5c90e 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -8,6 +8,8 @@ ; On open + Var ShowErrorText = "Invisible" + Var Tel_Confirm_State = "Invisible" Var ShowTextNumber = "Enable" Var Timeout = 0 @@ -69,7 +71,7 @@ If web_telnumOK = "" Then Else Var TelephoneNumber = web_telnumOK - Var StepGetPoint = 0 + Var StepGetPoint = 1 Var PdpaAsk = 0 @@ -82,7 +84,11 @@ Var TelephoneNumberX = TelephoneNumber - GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc + DEBUGVAR TelephoneNumber + ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc + Var Param1 = TelephoneNumber + "/" + Var Param1 = Param1 + ParamCP + GETACCEXT Param1 23 Open "ROOT/taobin_project/xml/page_collect_point_2.xml" EndIf @@ -101,6 +107,7 @@ SAVELOG "collect_point1-p71." Var TelephoneNumberX = TelephoneNumber + DEBUGVAR TelephoneNumber ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP @@ -146,6 +153,7 @@ If Timeout > 30 Then SAVELOG "collect_point1-p107." + ;Open "ROOT/taobin_project/xml/page_catalog.xml" Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf @@ -204,6 +212,12 @@ Var Tel_Confirm_State = "Enable" EndIf + Var ShowErrorText = "Invisible" + Var ShowTextNumber = "Invisible" + + TimerReset + Refresh + If TelNumLen = 7 Then Var number7 = "1" EndIf @@ -245,6 +259,12 @@ Var Tel_Confirm_State = "Enable" EndIf + Var ShowErrorText = "Invisible" + Var ShowTextNumber = "Invisible" + + TimerReset + Refresh + If TelNumLen = 7 Then Var number7 = "2" EndIf @@ -284,6 +304,12 @@ Var Tel_Confirm_State = "Enable" EndIf + Var ShowErrorText = "Invisible" + Var ShowTextNumber = "Invisible" + + TimerReset + Refresh + If TelNumLen = 7 Then Var number7 = "3" EndIf @@ -323,6 +349,12 @@ Var Tel_Confirm_State = "Enable" EndIf + Var ShowErrorText = "Invisible" + Var ShowTextNumber = "Invisible" + + TimerReset + Refresh + If TelNumLen = 7 Then Var number7 = "4" EndIf @@ -362,6 +394,12 @@ Var Tel_Confirm_State = "Enable" EndIf + Var ShowErrorText = "Invisible" + Var ShowTextNumber = "Invisible" + + TimerReset + Refresh + If TelNumLen = 7 Then Var number7 = "5" EndIf @@ -401,6 +439,12 @@ Var Tel_Confirm_State = "Enable" EndIf + Var ShowErrorText = "Invisible" + Var ShowTextNumber = "Invisible" + + TimerReset + Refresh + If TelNumLen = 7 Then Var number7 = "6" EndIf @@ -440,6 +484,12 @@ Var Tel_Confirm_State = "Enable" EndIf + Var ShowErrorText = "Invisible" + Var ShowTextNumber = "Invisible" + + TimerReset + Refresh + If TelNumLen = 7 Then Var number7 = "7" EndIf @@ -479,6 +529,12 @@ Var Tel_Confirm_State = "Enable" EndIf + Var ShowErrorText = "Invisible" + Var ShowTextNumber = "Invisible" + + TimerReset + Refresh + If TelNumLen = 7 Then Var number7 = "8" EndIf @@ -518,6 +574,12 @@ Var Tel_Confirm_State = "Enable" EndIf + Var ShowErrorText = "Invisible" + Var ShowTextNumber = "Invisible" + + TimerReset + Refresh + If TelNumLen = 7 Then Var number7 = "9" EndIf @@ -557,6 +619,7 @@ Var Tel_Confirm_State = "Enable" EndIf + Var ShowErrorText = "Invisible" Var ShowTextNumber = "Invisible" TimerReset @@ -627,6 +690,7 @@ SoundVolume ; goto lid straw + ;Open "ROOT/taobin_project/xml/page_catalog.xml" SAVELOG "collect_point1-p589." Open "ROOT/taobin_project/xml/page_lid_straw.xml" @@ -644,26 +708,77 @@ SoundVolume + + If Tel_Confirm_Flag = 1 Then - Var StepGetPoint = 1 - Var PdpaAsk = 0 + Var Tel2DFlag = 0 + + Var Tel2D = TelephoneNumber + Trim Tel2D 2 + + If Tel2D = "06" Then + Var Tel2DFlag = 1 + EndIf + If Tel2D = "07" Then + Var Tel2DFlag = 1 + EndIf + If Tel2D = "08" Then + Var Tel2DFlag = 1 + EndIf + If Tel2D = "09" Then + Var Tel2DFlag = 1 + EndIf + - Var OperatorTemp = "" - Var CreditAmount = 0 - Var OperatorStatus = "" - Var AccountType = "" - - SAVELOG "collect_point1-p583." - Var TelephoneNumberX = TelephoneNumber - ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc - Var Param1 = TelephoneNumber + "/" - Var Param1 = Param1 + ParamCP - GETACCEXT Param1 23 - Open "ROOT/taobin_project/xml/page_collect_point_2.xml" + + If Tel2DFlag = 1 Then + + + Var StepGetPoint = 1 + + Var PdpaAsk = 0 + + Var OperatorTemp = "" + Var CreditAmount = 0 + Var OperatorStatus = "" + Var AccountType = "" + + SAVELOG "collect_point1-p583." + Var TelephoneNumberX = TelephoneNumber + ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc + DEBUGVAR TelephoneNumber + + + Var Param1 = TelephoneNumber + "/" + Var Param1 = Param1 + ParamCP + If Seeker = "next" Then + Else + GETACCEXT Param1 23 + EndIf + ;Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_collect_point_2.xml" + Else + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/collectiing_en" + Else + Var DirImage2 = "ROOT/taobin_project/image/collectiing" + EndIf + + Var text_show_error = DirImage2 + "/text_show_error5.png" + + Var ShowErrorText = "Enable" + ;Var TelephoneNumber = "" + Var Tel_Confirm_State = "Invisible" + Refresh + + + + EndIf EndIf @@ -723,6 +838,14 @@ 0x513C2F ShowCountDownBrewing + + + + 152 + 955 + ShowErrorText + text_show_error + diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml index 5c7a427c..f9c12d74 100644 --- a/xml/page_collect_point_2.xml +++ b/xml/page_collect_point_2.xml @@ -35,8 +35,6 @@ If PayOfflineMode = 1 Then Var Seeker.TaobinErrorNetwork = 1 - ;Var Seeker.PointTaobinStr = "" + PayAmount - ;Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" Var Seeker.PointTaobinStr = ParamCP Var TelephoneNumber = TelephoneNumberX Var Seeker.TNumberTaobinMember= TelephoneNumber @@ -55,22 +53,18 @@ Var Timeout = Timeout + 1 If Timeout > 30 Then - If StepGetPoint = 0 Then - Open "ROOT/taobin_project/xml/page_show_consent.xml" - Else + Var TaobinLevel = 0 Var CoffeePoint = 1 Var Seeker.TaobinErrorNetwork = 1 - ;Var Seeker.PointTaobinStr = "" + PayAmount - ;Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" Var Seeker.PointTaobinStr = ParamCP Var TelephoneNumber = TelephoneNumberX Var Seeker.TNumberTaobinMember= TelephoneNumber Open "ROOT/taobin_project/xml/page_collect_point_error.xml" - EndIf + EndIf @@ -108,8 +102,6 @@ If Ext1a = "" Then Var Seeker.TaobinErrorNetwork = 1 - ;Var Seeker.PointTaobinStr = "" + PayAmount - ;Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" Var Seeker.PointTaobinStr = ParamCP Var TelephoneNumber = TelephoneNumberX Var Seeker.TNumberTaobinMember = TelephoneNumber @@ -157,11 +149,9 @@ EndIf - ;Var Seeker.PointTaobinStr = "" + PointTaobin - ;Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/" - ;Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + PointTaobin Var Seeker.PointTaobinStr = ParamCP + Var Seeker.TNumberTaobinMember = TelephoneNumberX Var CoffeePointRank = Ext1b @@ -182,6 +172,8 @@ Var CoffeePointRankTmp = CoffeePointRank + DEBUGVAR Seeker.PointTaobinStr + DEBUGVAR Seeker.TNumberTaobinMember If TaobinPDPA = 0 Then Open "ROOT/taobin_project/xml/page_show_consent.xml" EndIf @@ -191,8 +183,7 @@ Else Var Seeker.TaobinErrorNetwork = 1 - ;Var Seeker.PointTaobinStr = "" + PayAmount - ;Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" + Var Seeker.PointTaobinStr = ParamCP Var TelephoneNumber = TelephoneNumberX Var Seeker.TNumberTaobinMember = TelephoneNumber @@ -210,18 +201,15 @@ - If StepGetPoint = 0 Then - Open "ROOT/taobin_project/xml/page_show_consent.xml" - Else - ;Var CoffeePoint = 1 + + Var Seeker.TaobinErrorNetwork = 1 - ;Var Seeker.PointTaobinStr = "" + PayAmount - ;Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0" + Var Seeker.PointTaobinStr = ParamCP Var TelephoneNumber = TelephoneNumberX Var Seeker.TNumberTaobinMember= TelephoneNumber Open "ROOT/taobin_project/xml/page_collect_point_error.xml" - EndIf + diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml index 510c4358..9900a38e 100644 --- a/xml/page_collect_point_3.xml +++ b/xml/page_collect_point_3.xml @@ -23,7 +23,8 @@ Var CoffeePointStr = CoffeePoint - SAVELOG TelephoneNumber + DEBUGVAR TelephoneNumber + DEBUGVAR TelephoneNumberX If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/display_point_en" diff --git a/xml/page_payment.xml b/xml/page_payment.xml index e8d12605..79f05be2 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -5,6 +5,9 @@ "0xeae6e1" ; On open + + Var IndoQR = 0 + Var GetPayInfoFlag = 0 Var SessionID2 = "" Var testservice = "kbank" @@ -117,7 +120,7 @@ If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" Var PlaySoundLag = "ROOT/taobin_project/sound_eng/How_would_you_like_to_pay.mp3" - Var PlaySoundCodeLang = "ROOT/sounds_eng/Code8digit.m4a" + Var PlaySoundCodeLang = "ROOT/taobin_project/sound_eng/Code8digit.mp3" Else diff --git a/xml/page_payment_camera.xml b/xml/page_payment_camera.xml index db4eb675..e393886d 100644 --- a/xml/page_payment_camera.xml +++ b/xml/page_payment_camera.xml @@ -241,7 +241,7 @@ + + @@ -736,7 +778,15 @@ 942 ShowErrorText "Enable" - "ROOT/taobin_project/image/collectiing/text_show_notfound.png" + Var( DirImage + "/text_show_notfound.png") + + + + 152 + 920 + ShowErrorText2 + "Enable" + Var( DirImage + "/text_show_error5.png") diff --git a/xml/page_payment_storeCredit2.xml b/xml/page_payment_storeCredit2.xml index 1ec26502..d4eced83 100644 --- a/xml/page_payment_storeCredit2.xml +++ b/xml/page_payment_storeCredit2.xml @@ -803,6 +803,8 @@ DEBUGVAR CoffeeCredit DEBUGVAR Curr.CurrCreditAmount + DEBUGVAR Curr.CurrCreditTelNum + DEBUGVAR Seeker.TNumberTaobinCredit If Seeker.TNumberTaobinCredit = Curr.CurrCreditTelNum Then Var CoffeeCredit = CoffeeCredit + Curr.CurrCreditAmount diff --git a/xml/page_show_consent.xml b/xml/page_show_consent.xml index e011bda5..171d44e5 100644 --- a/xml/page_show_consent.xml +++ b/xml/page_show_consent.xml @@ -33,7 +33,7 @@ Var ShowCountDownBrewing = CountDownBrewing Var Timeout = Timeout + 1 - If Timeout > 30 Then + If Timeout > 5 Then ; goto lid straw ;SAVELOG "Timeout" ;Open "ROOT/taobin_project/xml/page_lid_straw.xml" diff --git a/xml/page_topping_select5.xml b/xml/page_topping_select5.xml index 925da627..db0a3261 100644 --- a/xml/page_topping_select5.xml +++ b/xml/page_topping_select5.xml @@ -14,6 +14,8 @@ WEB "DISABLE" DEBUGVAR Seeker + Var BGSugarNew = "Enable" + DEBUGVAR video_menu_0 DEBUGVAR SelectDrink @@ -1731,7 +1733,7 @@ 988 156 20 - "Enable" + BGSugarNew ; sugar layout "Enable" @@ -1746,9 +1748,9 @@ 120 79 SugarState1 - Var( DirImage + "/bn_sugar1.png" ) - Var( DirImage + "/bp_sugar1.png" ) - Var( DirImage + "/bu_sugar1.png" ) + Var( DirImage + "/bn_sugarlevel1.png" ) + Var( DirImage + "/bp_sugarlevel1.png" ) + Var( DirImage + "/bu_sugarlevel1.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -1781,12 +1783,12 @@ ; sugar2 + +; sugar6 +