diff --git a/image/bn_brew2.png b/image/bn_brew2.png deleted file mode 100644 index 53b93bd6..00000000 Binary files a/image/bn_brew2.png and /dev/null differ diff --git a/image/bn_cancel.png b/image/bn_cancel.png new file mode 100644 index 00000000..13478bc6 Binary files /dev/null and b/image/bn_cancel.png differ diff --git a/image/bp_brew1.png b/image/bp_brew1.png deleted file mode 100644 index b0e43c39..00000000 Binary files a/image/bp_brew1.png and /dev/null differ diff --git a/image/bp_cancel.png b/image/bp_cancel.png new file mode 100644 index 00000000..b31df13d Binary files /dev/null and b/image/bp_cancel.png differ diff --git a/image/collect_point1_en/img2_eng.png b/image/collect_point1_en/img2_eng.png new file mode 100644 index 00000000..0652e86a Binary files /dev/null and b/image/collect_point1_en/img2_eng.png differ diff --git a/image/display_point/btp_stamp_1_1.png b/image/display_point/btp_stamp_1_1.png new file mode 100644 index 00000000..1399fc9d Binary files /dev/null and b/image/display_point/btp_stamp_1_1.png differ diff --git a/image/page_doing/6.png b/image/page_doing/6.png new file mode 100644 index 00000000..e1113024 Binary files /dev/null and b/image/page_doing/6.png differ diff --git a/image/page_doing/image_bottom1.png b/image/page_doing/image_bottom1.png new file mode 100644 index 00000000..49db139f Binary files /dev/null and b/image/page_doing/image_bottom1.png differ diff --git a/image/page_doing/img2_eng.png b/image/page_doing/img2_eng.png new file mode 100644 index 00000000..0652e86a Binary files /dev/null and b/image/page_doing/img2_eng.png differ diff --git a/image/page_doing/text_bottom_eng.png b/image/page_doing/text_bottom_eng.png new file mode 100644 index 00000000..3113a43d Binary files /dev/null and b/image/page_doing/text_bottom_eng.png differ diff --git a/image/page_doing/text_bottom_thai2.png b/image/page_doing/text_bottom_thai2.png new file mode 100644 index 00000000..88d67622 Binary files /dev/null and b/image/page_doing/text_bottom_thai2.png differ diff --git a/image/page_doing/txt_1.png b/image/page_doing/txt_1.png new file mode 100644 index 00000000..ecef3470 Binary files /dev/null and b/image/page_doing/txt_1.png differ diff --git a/image/page_doing/txt_10.png b/image/page_doing/txt_10.png new file mode 100644 index 00000000..01f6c755 Binary files /dev/null and b/image/page_doing/txt_10.png differ diff --git a/image/page_doing/txt_10_en.png b/image/page_doing/txt_10_en.png new file mode 100644 index 00000000..0a657acd Binary files /dev/null and b/image/page_doing/txt_10_en.png differ diff --git a/image/page_doing/txt_11.png b/image/page_doing/txt_11.png new file mode 100644 index 00000000..0024e00b Binary files /dev/null and b/image/page_doing/txt_11.png differ diff --git a/image/page_doing/txt_11_en.png b/image/page_doing/txt_11_en.png new file mode 100644 index 00000000..f8ecead7 Binary files /dev/null and b/image/page_doing/txt_11_en.png differ diff --git a/image/page_doing/txt_12.png b/image/page_doing/txt_12.png new file mode 100644 index 00000000..aea1caa9 Binary files /dev/null and b/image/page_doing/txt_12.png differ diff --git a/image/page_doing/txt_12_en.png b/image/page_doing/txt_12_en.png new file mode 100644 index 00000000..b46ae961 Binary files /dev/null and b/image/page_doing/txt_12_en.png differ diff --git a/image/page_doing/txt_13.png b/image/page_doing/txt_13.png new file mode 100644 index 00000000..5b4dd9b4 Binary files /dev/null and b/image/page_doing/txt_13.png differ diff --git a/image/page_doing/txt_13_en.png b/image/page_doing/txt_13_en.png new file mode 100644 index 00000000..f9016aab Binary files /dev/null and b/image/page_doing/txt_13_en.png differ diff --git a/image/page_doing/txt_14.png b/image/page_doing/txt_14.png new file mode 100644 index 00000000..89970dde Binary files /dev/null and b/image/page_doing/txt_14.png differ diff --git a/image/page_doing/txt_14_en.png b/image/page_doing/txt_14_en.png new file mode 100644 index 00000000..731d4787 Binary files /dev/null and b/image/page_doing/txt_14_en.png differ diff --git a/image/page_doing/txt_15.png b/image/page_doing/txt_15.png new file mode 100644 index 00000000..9eb2b831 Binary files /dev/null and b/image/page_doing/txt_15.png differ diff --git a/image/page_doing/txt_15_en.png b/image/page_doing/txt_15_en.png new file mode 100644 index 00000000..80b2cc82 Binary files /dev/null and b/image/page_doing/txt_15_en.png differ diff --git a/image/page_doing/txt_16.png b/image/page_doing/txt_16.png new file mode 100644 index 00000000..a17fef50 Binary files /dev/null and b/image/page_doing/txt_16.png differ diff --git a/image/page_doing/txt_16_en.png b/image/page_doing/txt_16_en.png new file mode 100644 index 00000000..5b01aede Binary files /dev/null and b/image/page_doing/txt_16_en.png differ diff --git a/image/page_doing/txt_17.png b/image/page_doing/txt_17.png new file mode 100644 index 00000000..7c0fa160 Binary files /dev/null and b/image/page_doing/txt_17.png differ diff --git a/image/page_doing/txt_17_en.png b/image/page_doing/txt_17_en.png new file mode 100644 index 00000000..1efd7af6 Binary files /dev/null and b/image/page_doing/txt_17_en.png differ diff --git a/image/page_doing/txt_18.png b/image/page_doing/txt_18.png new file mode 100644 index 00000000..b15137fb Binary files /dev/null and b/image/page_doing/txt_18.png differ diff --git a/image/page_doing/txt_18_en.png b/image/page_doing/txt_18_en.png new file mode 100644 index 00000000..f978cf9b Binary files /dev/null and b/image/page_doing/txt_18_en.png differ diff --git a/image/page_doing/txt_19.png b/image/page_doing/txt_19.png new file mode 100644 index 00000000..158879fe Binary files /dev/null and b/image/page_doing/txt_19.png differ diff --git a/image/page_doing/txt_19_en.png b/image/page_doing/txt_19_en.png new file mode 100644 index 00000000..90db1924 Binary files /dev/null and b/image/page_doing/txt_19_en.png differ diff --git a/image/page_doing/txt_1_en.png b/image/page_doing/txt_1_en.png new file mode 100644 index 00000000..d8038439 Binary files /dev/null and b/image/page_doing/txt_1_en.png differ diff --git a/image/page_doing/txt_2.png b/image/page_doing/txt_2.png new file mode 100644 index 00000000..1aa9a631 Binary files /dev/null and b/image/page_doing/txt_2.png differ diff --git a/image/page_doing/txt_20.png b/image/page_doing/txt_20.png new file mode 100644 index 00000000..9d323f55 Binary files /dev/null and b/image/page_doing/txt_20.png differ diff --git a/image/page_doing/txt_20_en.png b/image/page_doing/txt_20_en.png new file mode 100644 index 00000000..82ad86e0 Binary files /dev/null and b/image/page_doing/txt_20_en.png differ diff --git a/image/page_doing/txt_21.png b/image/page_doing/txt_21.png new file mode 100644 index 00000000..347cb5a8 Binary files /dev/null and b/image/page_doing/txt_21.png differ diff --git a/image/page_doing/txt_21_en.png b/image/page_doing/txt_21_en.png new file mode 100644 index 00000000..bf3f0620 Binary files /dev/null and b/image/page_doing/txt_21_en.png differ diff --git a/image/page_doing/txt_22.png b/image/page_doing/txt_22.png new file mode 100644 index 00000000..0fe95bfe Binary files /dev/null and b/image/page_doing/txt_22.png differ diff --git a/image/page_doing/txt_22_en.png b/image/page_doing/txt_22_en.png new file mode 100644 index 00000000..b262e951 Binary files /dev/null and b/image/page_doing/txt_22_en.png differ diff --git a/image/page_doing/txt_23.png b/image/page_doing/txt_23.png new file mode 100644 index 00000000..bff759aa Binary files /dev/null and b/image/page_doing/txt_23.png differ diff --git a/image/page_doing/txt_23_en.png b/image/page_doing/txt_23_en.png new file mode 100644 index 00000000..0be3c75c Binary files /dev/null and b/image/page_doing/txt_23_en.png differ diff --git a/image/page_doing/txt_2_en.png b/image/page_doing/txt_2_en.png new file mode 100644 index 00000000..9f9d2ec9 Binary files /dev/null and b/image/page_doing/txt_2_en.png differ diff --git a/image/page_doing/txt_3.png b/image/page_doing/txt_3.png new file mode 100644 index 00000000..3268f9d6 Binary files /dev/null and b/image/page_doing/txt_3.png differ diff --git a/image/page_doing/txt_3_en.png b/image/page_doing/txt_3_en.png new file mode 100644 index 00000000..301ab8af Binary files /dev/null and b/image/page_doing/txt_3_en.png differ diff --git a/image/page_doing/txt_4.png b/image/page_doing/txt_4.png new file mode 100644 index 00000000..957c7334 Binary files /dev/null and b/image/page_doing/txt_4.png differ diff --git a/image/page_doing/txt_4_en.png b/image/page_doing/txt_4_en.png new file mode 100644 index 00000000..b19da297 Binary files /dev/null and b/image/page_doing/txt_4_en.png differ diff --git a/image/page_doing/txt_5.png b/image/page_doing/txt_5.png new file mode 100644 index 00000000..d0a994f0 Binary files /dev/null and b/image/page_doing/txt_5.png differ diff --git a/image/page_doing/txt_5_en.png b/image/page_doing/txt_5_en.png new file mode 100644 index 00000000..50d6dff8 Binary files /dev/null and b/image/page_doing/txt_5_en.png differ diff --git a/image/page_doing/txt_6_en.png b/image/page_doing/txt_6_en.png new file mode 100644 index 00000000..7ebe420b Binary files /dev/null and b/image/page_doing/txt_6_en.png differ diff --git a/image/page_doing/txt_7.png b/image/page_doing/txt_7.png new file mode 100644 index 00000000..632b2ef5 Binary files /dev/null and b/image/page_doing/txt_7.png differ diff --git a/image/page_doing/txt_7_en.png b/image/page_doing/txt_7_en.png new file mode 100644 index 00000000..1efd7af6 Binary files /dev/null and b/image/page_doing/txt_7_en.png differ diff --git a/image/page_doing/txt_8.png b/image/page_doing/txt_8.png new file mode 100644 index 00000000..1100d287 Binary files /dev/null and b/image/page_doing/txt_8.png differ diff --git a/image/page_doing/txt_8_en.png b/image/page_doing/txt_8_en.png new file mode 100644 index 00000000..0f9078ef Binary files /dev/null and b/image/page_doing/txt_8_en.png differ diff --git a/image/page_doing/txt_9.png b/image/page_doing/txt_9.png new file mode 100644 index 00000000..3407450e Binary files /dev/null and b/image/page_doing/txt_9.png differ diff --git a/image/page_doing/txt_9_en.png b/image/page_doing/txt_9_en.png new file mode 100644 index 00000000..493a02e3 Binary files /dev/null and b/image/page_doing/txt_9_en.png differ diff --git a/image/page_drink_disable/bn_kuromitsu_coffee.png b/image/page_drink_disable/bn_kuromitsu_coffee.png new file mode 100644 index 00000000..f7b5a29f Binary files /dev/null and b/image/page_drink_disable/bn_kuromitsu_coffee.png differ diff --git a/image/tab_1.png b/image/tab_1.png new file mode 100755 index 00000000..ddb0dc89 Binary files /dev/null and b/image/tab_1.png differ diff --git a/image/topping/bn_brew1.png b/image/topping/bn_brew1.png index 9bb9258b..31579cd4 100644 Binary files a/image/topping/bn_brew1.png and b/image/topping/bn_brew1.png differ diff --git a/image/topping/bn_brew2.png b/image/topping/bn_brew2.png index dd93a1fd..b03357ba 100644 Binary files a/image/topping/bn_brew2.png and b/image/topping/bn_brew2.png differ diff --git a/image/topping/bn_sugar1.png b/image/topping/bn_sugar1.png index 29df7eb9..47aceda1 100644 Binary files a/image/topping/bn_sugar1.png and b/image/topping/bn_sugar1.png differ diff --git a/image/topping/bn_sugar2.png b/image/topping/bn_sugar2.png index 31e41ca1..9bc490c8 100644 Binary files a/image/topping/bn_sugar2.png and b/image/topping/bn_sugar2.png differ diff --git a/image/topping/bn_sugar3.png b/image/topping/bn_sugar3.png index 53a36b5a..db11ccef 100644 Binary files a/image/topping/bn_sugar3.png and b/image/topping/bn_sugar3.png differ diff --git a/image/topping/bn_sugar4.png b/image/topping/bn_sugar4.png index 738473d4..a3028b48 100644 Binary files a/image/topping/bn_sugar4.png and b/image/topping/bn_sugar4.png differ diff --git a/image/topping/bn_sugar5.png b/image/topping/bn_sugar5.png index 96591310..6e6020e6 100644 Binary files a/image/topping/bn_sugar5.png and b/image/topping/bn_sugar5.png differ diff --git a/image/topping/bp_brew1.png b/image/topping/bp_brew1.png index 775d98f2..f31142e6 100644 Binary files a/image/topping/bp_brew1.png and b/image/topping/bp_brew1.png differ diff --git a/image/topping/bp_brew2.png b/image/topping/bp_brew2.png index 0156ac35..16c68a58 100644 Binary files a/image/topping/bp_brew2.png and b/image/topping/bp_brew2.png differ diff --git a/image/topping/bp_sugar1.png b/image/topping/bp_sugar1.png index a384f118..de9b1548 100644 Binary files a/image/topping/bp_sugar1.png and b/image/topping/bp_sugar1.png differ diff --git a/image/topping/bp_sugar2.png b/image/topping/bp_sugar2.png index 644045be..45811628 100644 Binary files a/image/topping/bp_sugar2.png and b/image/topping/bp_sugar2.png differ diff --git a/image/topping/bp_sugar3.png b/image/topping/bp_sugar3.png index e582333b..7ec36ef2 100644 Binary files a/image/topping/bp_sugar3.png and b/image/topping/bp_sugar3.png differ diff --git a/image/topping/bp_sugar4.png b/image/topping/bp_sugar4.png index e3f49d4d..69f27b31 100644 Binary files a/image/topping/bp_sugar4.png and b/image/topping/bp_sugar4.png differ diff --git a/image/topping/bp_sugar5.png b/image/topping/bp_sugar5.png index b47acc74..5eb42cd2 100644 Binary files a/image/topping/bp_sugar5.png and b/image/topping/bp_sugar5.png differ diff --git a/image/topping/img_sugar.png b/image/topping/img_sugar.png index 777522bd..37b1a129 100644 Binary files a/image/topping/img_sugar.png and b/image/topping/img_sugar.png differ diff --git a/image/topping_en/bn_brew1.png b/image/topping_en/bn_brew1.png new file mode 100644 index 00000000..16067473 Binary files /dev/null and b/image/topping_en/bn_brew1.png differ diff --git a/image/topping_en/bn_brew2.png b/image/topping_en/bn_brew2.png new file mode 100644 index 00000000..4709e6f7 Binary files /dev/null and b/image/topping_en/bn_brew2.png differ diff --git a/image/topping_en/bn_cancel.png b/image/topping_en/bn_cancel.png new file mode 100644 index 00000000..c71f24d8 Binary files /dev/null and b/image/topping_en/bn_cancel.png differ diff --git a/image/topping_en/bn_next.png b/image/topping_en/bn_next.png new file mode 100644 index 00000000..3b020d61 Binary files /dev/null and b/image/topping_en/bn_next.png differ diff --git a/image/topping_en/bn_sugar1.png b/image/topping_en/bn_sugar1.png new file mode 100644 index 00000000..cdd0ff32 Binary files /dev/null and b/image/topping_en/bn_sugar1.png differ diff --git a/image/topping_en/bn_sugar2.png b/image/topping_en/bn_sugar2.png new file mode 100644 index 00000000..55212781 Binary files /dev/null and b/image/topping_en/bn_sugar2.png differ diff --git a/image/topping_en/bn_sugar3.png b/image/topping_en/bn_sugar3.png new file mode 100644 index 00000000..97637c20 Binary files /dev/null and b/image/topping_en/bn_sugar3.png differ diff --git a/image/topping_en/bn_sugar4.png b/image/topping_en/bn_sugar4.png new file mode 100644 index 00000000..e49e54e9 Binary files /dev/null and b/image/topping_en/bn_sugar4.png differ diff --git a/image/topping_en/bn_sugar5.png b/image/topping_en/bn_sugar5.png new file mode 100644 index 00000000..bd5d1679 Binary files /dev/null and b/image/topping_en/bn_sugar5.png differ diff --git a/image/topping_en/bp_brew1.png b/image/topping_en/bp_brew1.png new file mode 100644 index 00000000..e1a50099 Binary files /dev/null and b/image/topping_en/bp_brew1.png differ diff --git a/image/topping_en/bp_brew2.png b/image/topping_en/bp_brew2.png new file mode 100644 index 00000000..bf732da4 Binary files /dev/null and b/image/topping_en/bp_brew2.png differ diff --git a/image/topping_en/bp_cancel.png b/image/topping_en/bp_cancel.png new file mode 100644 index 00000000..da258d8b Binary files /dev/null and b/image/topping_en/bp_cancel.png differ diff --git a/image/topping_en/bp_next.png b/image/topping_en/bp_next.png new file mode 100644 index 00000000..98a0f92a Binary files /dev/null and b/image/topping_en/bp_next.png differ diff --git a/image/topping_en/bp_sugar1.png b/image/topping_en/bp_sugar1.png new file mode 100644 index 00000000..26bb755d Binary files /dev/null and b/image/topping_en/bp_sugar1.png differ diff --git a/image/topping_en/bp_sugar2.png b/image/topping_en/bp_sugar2.png new file mode 100644 index 00000000..6fb97b5f Binary files /dev/null and b/image/topping_en/bp_sugar2.png differ diff --git a/image/topping_en/bp_sugar3.png b/image/topping_en/bp_sugar3.png new file mode 100644 index 00000000..ab19efb6 Binary files /dev/null and b/image/topping_en/bp_sugar3.png differ diff --git a/image/topping_en/bp_sugar4.png b/image/topping_en/bp_sugar4.png new file mode 100644 index 00000000..19b8d00e Binary files /dev/null and b/image/topping_en/bp_sugar4.png differ diff --git a/image/topping_en/bp_sugar5.png b/image/topping_en/bp_sugar5.png new file mode 100644 index 00000000..d8fcca13 Binary files /dev/null and b/image/topping_en/bp_sugar5.png differ diff --git a/image/topping_en/img_sugar.png b/image/topping_en/img_sugar.png index ac5ec0a9..ef106619 100644 Binary files a/image/topping_en/img_sugar.png and b/image/topping_en/img_sugar.png differ diff --git a/image/user_take_cup_en/bn_door_open.png b/image/user_take_cup_en/bn_door_open.png new file mode 100644 index 00000000..d187683d Binary files /dev/null and b/image/user_take_cup_en/bn_door_open.png differ diff --git a/image/user_take_cup_en/bp_door_open.png b/image/user_take_cup_en/bp_door_open.png new file mode 100644 index 00000000..51188674 Binary files /dev/null and b/image/user_take_cup_en/bp_door_open.png differ diff --git a/image/user_take_cup_en/img5.png b/image/user_take_cup_en/img5.png new file mode 100644 index 00000000..3fb46f26 Binary files /dev/null and b/image/user_take_cup_en/img5.png differ diff --git a/image/user_take_cup_th/bn_door_open.png b/image/user_take_cup_th/bn_door_open.png new file mode 100644 index 00000000..1ffdb1df Binary files /dev/null and b/image/user_take_cup_th/bn_door_open.png differ diff --git a/image/user_take_cup_th/bp_door_open.png b/image/user_take_cup_th/bp_door_open.png new file mode 100644 index 00000000..0fc49974 Binary files /dev/null and b/image/user_take_cup_th/bp_door_open.png differ diff --git a/image/user_take_cup_th/img5.png b/image/user_take_cup_th/img5.png new file mode 100644 index 00000000..7a352578 Binary files /dev/null and b/image/user_take_cup_th/img5.png differ diff --git a/video/taobin_adv1.mp4 b/video/taobin_adv1.mp4 new file mode 100644 index 00000000..59a076bb Binary files /dev/null and b/video/taobin_adv1.mp4 differ diff --git a/video/taobin_adv2.mp4 b/video/taobin_adv2.mp4 new file mode 100644 index 00000000..1ece641c Binary files /dev/null and b/video/taobin_adv2.mp4 differ diff --git a/xml/menu_catalog.xml b/xml/menu_catalog.xml index 31ae9ced..06ccec94 100644 --- a/xml/menu_catalog.xml +++ b/xml/menu_catalog.xml @@ -1,10 +1,19 @@ - +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + ; under line diff --git a/xml/menu_gen.py b/xml/menu_gen.py index 8c30f7bc..0a7c14dd 100644 --- a/xml/menu_gen.py +++ b/xml/menu_gen.py @@ -36,7 +36,7 @@ out_xml( '\t\tVar PriceDrink = $' + product_code[i] + '.Price\r\n') out_xml( '\t\tVar PictureDrink = "' + default_dir2 + '" + $'+ product_code[i] +'.image\r\n') out_xml( '\t\tTopping "Load" SelectDrink\r\n') - out_xml( '\t\tSAVELOG NameDrink\r\n') + #out_xml( '\t\tSAVELOG NameDrink\r\n') out_xml( '\t\tVar PriceShowValue = charOfBaht + PriceDrink\r\n') #out_xml( '\t\tVar PriceShowValue = "Free"\r\n') out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_alter.xml"\r\n') diff --git a/xml/page_back_to_main.xml b/xml/page_back_to_main.xml index 2c04639f..e70e5124 100644 --- a/xml/page_back_to_main.xml +++ b/xml/page_back_to_main.xml @@ -7,8 +7,11 @@ OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" + TopView "hide" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" + + 60000 diff --git a/xml/page_board.xml b/xml/page_board.xml index d6ac2018..277fab67 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -52,7 +52,7 @@ EndIf If MachineStage = "close-maintenance" Then - ;Open "ROOT/taobin_project/xml/page_show_error.xml" + Open "ROOT/taobin_project/xml/page_show_error.xml" EndIf @@ -61,22 +61,30 @@ Var TestLoopFailed = 0 + Var IgnoreNetCore = "true" 800 + If IgnoreNetCore = "true" Then + If NetworkStatus = "DOWN" Then + Open "/ROOT/xml/outservice.xml" + EndIf + If NetworkStatus = "DEACTIVE" Then + Open "/ROOT/xml/offline.xml" + EndIf + If MachineStage = "close-maintenance" Then + Open "ROOT/taobin_project/xml/page_show_error.xml" - If MachineStage = "close-maintenance" Then - Open "ROOT/taobin_project/xml/page_show_error.xml" + EndIf EndIf - If MachineStage = "drink-failed" Then Open "ROOT/taobin_project/xml/page_show_error.xml" @@ -87,8 +95,8 @@ Var CountDownShowButton = CountDownShowButton - 1 - SAVELOG CountDownShowButton - SAVELOG ShowButtonClickFull + ;SAVELOG CountDownShowButton + ;SAVELOG ShowButtonClickFull If CountDownShowButton = 28 Then Var ShowButtonClickFull = "Enable" @@ -125,6 +133,7 @@ diff --git a/xml/page_brewing.xml b/xml/page_brewing.xml index b12f2a12..bb171f8d 100644 --- a/xml/page_brewing.xml +++ b/xml/page_brewing.xml @@ -60,12 +60,20 @@ - +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + 751 @@ -109,38 +117,38 @@ GIFShowProcess - - 0 - 1880 - 30 - Center - 1080 - RobotoBlack - 0x513C2F - MachineStage - +; +; 0 +; 1880 +; 30 +; Center +; 1080 +; RobotoBlack +; 0x513C2F +; MachineStage +; - +; diff --git a/xml/page_brewing2.xml b/xml/page_brewing2.xml index 56e1204e..97ad5903 100644 --- a/xml/page_brewing2.xml +++ b/xml/page_brewing2.xml @@ -461,11 +461,20 @@ "ROOT/taobin_project/video/taobin_brewing.mov" - +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml new file mode 100644 index 00000000..1a067113 --- /dev/null +++ b/xml/page_brewing3.xml @@ -0,0 +1,639 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + ; On open move from page_brewing3.xml + Var LidState = "Enable" + Var StarwState = "Enable" + Var countClick2 = 0 + + Var Timeout = 0 + + Var PrintCoinAmount = 0 + + + + + + If ActionOKCase = 1 Then + If CodeChannel = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "coffee" + Var ECommerce = "" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C00" + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C" + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + ;Var Timeout = 0 + Var ActionOKCase = 2 + + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + Else + + If ActionOKCase = 2 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + EndIf + + + + If ActionOKCase = 1 Then + If CodeChannel = 1 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "coffee" + Var ECommerce = "" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C00" + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C" + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + ;Var Timeout = 0 + Var ActionOKCase = 2 + + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + Else + + If ActionOKCase = 2 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + EndIf + + + + 600 + + + Var Timeout = Timeout + 1 + + Var CountDownBrewing = CountDownBrewing - 1 + + ; run test; + ;If CountDownBrewing = 40 Then + ; Open "ROOT/taobin_project/xml/page_drinkok.xml" + ;EndIf + If CountDownBrewing = 0 Then + ;Open "ROOT/taobin_project/xml/page_drinkok.xml" + EndIf + + Var ShowCountDownBrewing = CountDownBrewing + + + If Timeout > 330 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + + If Timeout > 300 Then + Var MachineState_Result = 2 + EndIf + + If ChangeFlag = 1 Then + Var ChangeTimeout = ChangeTimeout + 1 + EndIf + + + If ChangeOK = 2 Then + If ActionOKCase = 0 Then + Var TelephoneNumber = "0899999999" + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var ServiceType = "credit" + Var SessionID2 = SelectDrink + Var ServiceCredit = "coffee" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + ;Open "ROOT/xml/page_closeMaintenance.xml" + Var ActionOKCase = 1 + EndIf + EndIf + + If ChangeTimeout > 30 Then + If ActionOKCase = 0 Then + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var TelephoneNumber = "0899999999" + Var ServiceType = "credit" + Var SessionID2 = SelectDrink + Var ServiceCredit = "coffee" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + ;Open "ROOT/xml/menu_closeMaintenance.xml" + Var ActionOKCase = 1 + EndIf + EndIf + + If ChangeOK = 3 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + If ChangeOK = 4 Then + If ActionOKCase = 0 Then + Var SessionID2 = SelectSlot + ":" + Var SessionID2 = SessionID2 + ExtendData + Var CreditAmount1 = "" + Var ServiceAmountFlow = "" + Var TelephoneNumber = "0899999999" + Var ServiceType = "coffee" + Var ECommerce = "" + Var ECommerce = ECommerce + PriceDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + DiscountDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SessionID2 + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + SelectDrink + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C00" + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + CodeNumber + Var ECommerce = ECommerce + "/" + Var ECommerce = ECommerce + "C" + Var ServiceParameter = "max" + Var ServiceCharge = 0 + Var AccountType = "new" + Var testservice = "kbank" + Var tc = "" + Var GetScore = "" + Var OperatorName = "" + Var SessionID = "" + GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc + ;Var Timeout = 0 + Var ActionOKCase = 2 + EndIf + EndIf + + + If MachineState_Result = 1 Then + Var Timeout = 0 + Var ProcessText = "" + + Var TelephoneNumber = "0899999999" + Var ServiceType = "coffee" + Var ServiceCredit = SelectDrink + Var SuggestID = "" + + If PayWithQR = 0 Then + If CodeChannel = 1 Then + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + CodeNumber + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + VendingCode + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + SelectDrink + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + BoxID + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "S" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + CodeNumber + Var SessionID2 = SessionID2 + "/" + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + Else + If CodeChannel = 2 Then + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + VendingCode + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + SelectDrink + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + BoxID + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + "S" + Var SessionID2 = SessionID2 + "/" + Var SessionID2 = SessionID2 + CodeNumber + Var SessionID2 = SessionID2 + "/" + + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + Else + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + EndIf + EndIf + + + Else + If ChangeFlag2 = 1 Then + Var TelephoneNumber = "0899999999" + Var VendingDiscount = 0 + Var VendingCampaign = 0 + Var ServiceType = "credit" + Var SessionID2 = SelectDrink + Var ServiceCredit = "coffee" + Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate + EndIf + + EndIf + + + Var ServiceSuccess = "yes" + Open "ROOT/taobin_project/xml/page_drinkok.xml" + + EndIf + + If MachineState_Result = 2 Then + If ErrTimeout = 0 Then + Var ErrTimeout = 1 + + + + If PayWithQR = 0 Then + If CodeChannel = 0 Then + If ChangeFlag = 0 Then + Var ChangeFlag = 1 + Change ServiceAmount2 + + EndIf + Else + If CoinAmount > 0 Then + + If ChangeFlag = 0 Then + Var ChangeFlag = 1 + Var ServiceAmount2 = ServiceAmount2 - IntVendingCampaign + Change ServiceAmount2 + + EndIf + Else + + If ChangeFlag2 = 1 Then + Var ChangeOK = 2 + Else + If CodeChannel = 1 Then + Var ChangeOK = 4 + Else + Var ChangeOK = 3 + EndIf + + EndIf + EndIf + + + EndIf + Else + + If CodeChannel = 0 Then + + If CoinAmount > 0 Then + If ChangeFlag = 0 Then + Var ChangeFlag = 1 + Var ServiceAmount2 = CoinAmount + Change CoinAmount + + EndIf + Else + If ChangeFlag2 = 1 Then + Var ChangeOK = 2 + Else + Var ChangeOK = 3 + EndIf + EndIf + + Else + + If CoinAmount > 0 Then + If ChangeFlag = 0 Then + Var ChangeFlag = 1 + Var ServiceAmount2 = CoinAmount + Change CoinAmount + + EndIf + Else + If ChangeFlag2 = 1 Then + Var ChangeOK = 2 + Else + Var ChangeOK = 4 + EndIf + EndIf + + EndIf + + + + EndIf + + OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_drinkfail.xml" + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml" + + ;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" + + EndIf + EndIf + + + If MachineStage = "show-menu" Then + Open "ROOT/taobin_project/xml/page_drinkok.xml" + EndIf + + If MachineStage = "close-maintenance" Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + If RoadShow = "true" Then + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + Else + Var MachineState_Result = 2 + EndIf + EndIf + + + ; animation video loop + If AnimationOn = "true" Then + Var CountUpBrewing = CountUpBrewing + 1 + + Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime + + If PreviseStepVideo = SlotVideo Then + SAVELOG SlotVideo + Else + Var PreviseStepVideo = SlotVideo + SAVELOG PreviseStepVideo + SAVELOG SlotVideo + SAVELOG CountUpBrewing + + ;Var CountDownVideoTime = CountDownVideoTimeReload + + Var StepVideo = SlotVideo + 2 + + SAVELOG StepVideo + + If StepVideo = 1 Then + Var videoID = VideoID1 + EndIf + If StepVideo = 2 Then + Var videoID = VideoID2 + EndIf + If StepVideo = 3 Then + Var videoID = VideoID3 + EndIf + If StepVideo = 4 Then + Var videoID = VideoID4 + EndIf + If StepVideo = 5 Then + Var videoID = VideoID5 + EndIf + If StepVideo = 6 Then + Var videoID = VideoID6 + EndIf + If StepVideo = 7 Then + Var videoID = VideoID7 + EndIf + + SAVELOG videoID + + If videoID = 0 Then + + Else + + Var VideoPlayFile = VideoPath + Var VideoPlayFile = VideoPlayFile + VideoFileBegin + Var VideoPlayFile = VideoPlayFile + videoID + Var VideoPlayFile = VideoPlayFile + VideoFileEnd + + SAVELOG VideoPlayFile + EndIf + EndIf + EndIf + + Refresh + TimerReset + + + + + + ;If MachineStage = "drink-success" Then + ; Open "ROOT/taobin_project/xml/page_drinkok.xml" + ;EndIf + ;If MachineStage = "drink-failed" Then + ; Open "ROOT/taobin_project/xml/page_drinkfail.xml" + ;EndIf + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + If RoadShow = "true" Then + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + Else + Var MachineState_Result = 2 + EndIf + EndIf + + Refresh + + + +; this copy in file menu_brew2.xml and menu_lid_straw.xml + + If ChangeStatus = "payout-end" Then + If ChangeFlag = 1 Then + Var ChangeOK = 2 + EndIf + EndIf + + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + + + +; +; 140 +; 1124 +; "ROOT/taobin_project/image/page_doing/text2.png" +; + + +; + + 751 + 413 + "ROOT/taobin_project/image/page_doing/img2.png" + +; + + XPosiShowCountDownBrew + 470 + End + 153 + 88 + RobotoBold + 0x513C2F + ShowCountDownBrewing + + +; +; 100 +; 470 +; End +; 153 +; 30 +; RobotoBold +; 0x513C2F +; MachineStage +; +; + + + + 0 + 1880 + 30 + Center + 1080 + RobotoBlack + 0x513C2F + MachineStage + + + + + + + + + 0 + 1886 + 20 + 1080 + Start + RobotoBlack + 0x513C2F + countClick + + + 0 + 1886 + 20 + 1080 + end + RobotoBlack + 0x513C2F + countClick2 + + + diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index 70706b8f..5038693c 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -69,17 +69,20 @@ ;EndIf - - + 1080 + 380 + "true" + "ROOT/taobin_project/video/taobin_adv2.mp4" + ; back - - 0 - 1886 - 20 - 1080 - Center - RobotoBlack - 0x513C2F - countDownRetrun - +; +; 0 +; 1886 +; 20 +; 1080 +; Center +; RobotoBlack +; 0x513C2F +; countDownRetrun +; - ; button i=10 11-99-02-0013 - - ; button i=4 11-99-02-0038 + ; button i=4 11-99-02-0037 + ; button i=5 11-99-02-0038 + - ; button i=5 11-99-02-0039 + ; button i=6 11-99-02-0039 - ; button i=6 11-99-02-0034 + ; button i=7 11-99-02-0034 - ; button i=7 11-99-02-0035 + ; button i=8 11-99-02-0035 - ; button i=8 11-99-02-0040 + ; button i=9 11-99-02-0040 - ; button i=9 11-99-02-0041 + ; button i=10 11-99-02-0041 - ; button i=10 11-99-02-0042 + ; button i=11 11-99-02-0042 - ; button i=11 11-99-02-0043 + ; button i=12 11-99-02-0043 - ; button i=12 11-99-02-0044 + ; button i=13 11-99-02-0044 - ; button i=13 11-99-02-0045 + ; button i=14 11-99-02-0045 diff --git a/xml/page_payment.xml b/xml/page_payment.xml index ce7afa3b..269b53c8 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -46,6 +46,11 @@ Var DirImage = "ROOT/taobin_project/image/page_payment" EndIf + If MachineStage = "close-maintenance" Then + Open "ROOT/taobin_project/xml/page_show_error.xml" + + EndIf + 900 @@ -108,11 +113,20 @@ - +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 6069d3c7..cf8acf6d 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -66,6 +66,8 @@ Var QRErrorState = "Invisible" + SAVELOG SelectDrink + SAVELOG QRChannel SAVELOG QRCODE99 @@ -321,6 +323,11 @@ EndIf EndIf + Var stringLog = "Timeout " + Timeout + Var stringLog = stringLog + " PayOK" + Var stringLog = stringLog + PayOK + + If Timeout > 60 Then If PayOK = 1 Then @@ -489,13 +496,20 @@ - +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + 199 @@ -795,16 +809,16 @@ Open "/media/bt/xml/security_alarm.xml" - - 0 - 1880 - 14 - "Left" - 1080 - KanitThinTTF - 0x513C2F - SelectDrink - +; +; 0 +; 1880 +; 14 +; "Left" +; 1080 +; KanitThinTTF +; 0x513C2F +; SelectDrink +; - - 0 - 1886 - 20 - 1080 - end - RobotoBlack - 0x513C2F - countClick2 - +; +; 0 +; 1886 +; 20 +; 1080 +; end +; RobotoBlack +; 0x513C2F +; countClick2 +; diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index bfd0a21d..7b300a88 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -504,6 +504,7 @@ - +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + ; back + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + +; back + + + + + + SAVELOG TOPPING1 + SAVELOG MenuCodeName + ;SAVELOG toppingID1Default + + If BugFlag = 1 Then + + Else + + + If RoadShow = "true" Then + Var PriceShowValue = "Free" + EndIf + + SAVELOG toppingID2price1 + SAVELOG toppingID2price2 + SAVELOG toppingID2price3 + EndIf + + + + + + + + + + 374 + 436 + 331 + 436 + PictureDrink + + + + 0 + 752 + 1080 + Center + 72 + KanitMediumTTF + 0x513C2F + showname + + + + 0 + 836 + 1080 + Center + 24 + KanitLightTTF + 0x6F5F51 + showdesc + + + +; back + + +; next + + + + + 924 + 1804 + KanitTTF + 36 + 1080 + 0xFFFFFF + PriceShowValue + + + + +; sugar layout + + 44 + y_topping_bg + BGSugar + "ROOT/taobin_project/image/topping/img1.png" + + +; sugar1 + + +; sugar2 + + + +; sugar3 + + +; sugar4 + + +; sugar5 + + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + diff --git a/xml/page_topping_premix50percent.xml b/xml/page_topping_premix50percent.xml new file mode 100644 index 00000000..e32b8e96 --- /dev/null +++ b/xml/page_topping_premix50percent.xml @@ -0,0 +1,383 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + ; On open + Var SugarState1 = "Invisible" + Var SugarState2 = "Invisible" + Var SugarState3 = "Invisible" + Var SugarState4 = "Invisible" + Var SugarState5 = "Invisible" + + ;Var SugarState1 = "Enable" + + + SAVELOG TOPPING1 + + SAVELOG toppingID1Default + Var topping1 = toppingID1Default + SAVELOG toppingID1index1 + SAVELOG toppingID1index2 + SAVELOG toppingID1index3 + SAVELOG toppingID1index4 + + SAVELOG TOPPING2 + SAVELOG TOPPING3 + SAVELOG TOPPING4 + + Var SugarState2 = "Pressforever" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + Var BGSugar = "Enable" + + ;SAVELOG PreviseXMLFileName2 + + + Var y_sugar_block = 105 + Var y_block = 206 + + Var y_topping_bg = 912 + Var y_topping = 912 + y_sugar_block + + Var y2_topping_bg = y_topping_bg + y_block + Var y2_topping = y_topping + y_block + + Var BugFlag = 0 + + If show_eng = "true" Then + + Var DirImage = "ROOT/taobin_project/image/topping_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + Var showname = NameDrink + Var showdesc = DrinkDescription + + Else + Var DirImage = "ROOT/taobin_project/image/topping" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + Var showname = NameDrinkTH + Var showdesc = DrinkDescriptionTH + EndIf + + CRLFToSpace showname + ;SAVELOG showname + + + 30000 + + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + + + + + +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + + +; back + + + + + + SAVELOG TOPPING1 + SAVELOG MenuCodeName + ;SAVELOG toppingID1Default + + If BugFlag = 1 Then + + Else + + + If RoadShow = "true" Then + Var PriceShowValue = "Free" + EndIf + + SAVELOG toppingID2price1 + SAVELOG toppingID2price2 + SAVELOG toppingID2price3 + EndIf + + + + + + + + + + 374 + 436 + 331 + 436 + PictureDrink + + + + 0 + 752 + 1080 + Center + 72 + KanitMediumTTF + 0x513C2F + showname + + + + 0 + 836 + 1080 + Center + 24 + KanitLightTTF + 0x6F5F51 + showdesc + + + +; back + + +; next + + + + + 924 + 1804 + KanitTTF + 36 + 1080 + 0xFFFFFF + PriceShowValue + + + + +; sugar layout + + 44 + y_topping_bg + BGSugar + "ROOT/taobin_project/image/topping/img1.png" + + +; sugar1 + + +; sugar2 + + + +; sugar3 + + +; sugar4 + + +; sugar5 + + + + + + + + Open "/media/bt/xml/security_alarm.xml" + + + + diff --git a/xml/page_topping_with_barista.xml b/xml/page_topping_with_barista.xml index 56c47bf6..db2985ce 100644 --- a/xml/page_topping_with_barista.xml +++ b/xml/page_topping_with_barista.xml @@ -21,18 +21,18 @@ Var NormalMenu = "Invisible" Var BaristaMenu = "Invisible" - Var BGSubmenu = "Enable" - Var BaristaMenu = "Enable" - Var NormalMenu = "PressForever" + Var BGSubmenu = "Invisible" + Var BaristaMenu = "Invisible" + Var NormalMenu = "Invisible" Var y_topping_bg = y2_topping_bg Var y_topping = y2_topping Var BGSugar = "Invisible" - SAVELOG TOPPING1 - SAVELOG TOPPING2 - SAVELOG PreviseXMLFileName2 + ;SAVELOG TOPPING1 + ;SAVELOG TOPPING2 + ;SAVELOG PreviseXMLFileName2 ; Var y_sugar_block = 105 @@ -48,10 +48,11 @@ Var BugFlag = 0 - SAVELOG y_topping_bg - SAVELOG y_topping - SAVELOG y2_topping_bg - SAVELOG y2_topping + ;SAVELOG y_topping_bg + ;SAVELOG y_topping + ;SAVELOG y2_topping_bg + ;SAVELOG y2_topping + If TOPPING1 = "Powder Sugar" Then Var SugarState1 = "PressForever" @@ -70,7 +71,7 @@ Var SugarState5 = "Enable" Var BGSugar = "Enable" ;SAVELOG SubMenuPrice1 - Var PriceShowValue = charOfBaht + SubMenuPrice1 + Var topping1 = toppingID1Default Refresh EndIf @@ -89,7 +90,7 @@ Var showname = NameDrinkTH Var showdesc = DrinkDescriptionTH EndIf - + CRLFToSpace showname @@ -99,12 +100,20 @@ - +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + 44 diff --git a/xml/test_video_loop.xml b/xml/test_video_loop.xml index 370ecb8b..5cf1815c 100644 --- a/xml/test_video_loop.xml +++ b/xml/test_video_loop.xml @@ -2,7 +2,10 @@ "ALL" HeadScreenWidth HeadScreenHeight - + diff --git a/xml/vending_info.xml b/xml/vending_info.xml index 164ac0fe..f203fc59 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -74,33 +74,42 @@ info_startX info_1Y - "ROOT/ui/page_03_summary/pic_summary_tab.png" + "ROOT/taobin_project/image/tab_1.png" + + Machine DoorOpen + info_startX info_2Y - "ROOT/ui/page_03_summary/pic_summary_tab.png" + "ROOT/taobin_project/image/tab_1.png" + + Machine Lid + info_startX info_3Y - "ROOT/ui/page_03_summary/pic_summary_tab.png" + "ROOT/taobin_project/image/tab_1.png" + + Machine Straw + info_startX info_4Y - "ROOT/ui/page_03_summary/pic_summary_tab.png" + "ROOT/taobin_project/image/tab_1.png" info_startX info_5Y - "ROOT/ui/page_03_summary/pic_summary_tab.png" + "ROOT/taobin_project/image/tab_1.png" @@ -108,33 +117,33 @@ info2_startX info_1Y - "ROOT/ui/page_03_summary/pic_summary_tab.png" + "ROOT/taobin_project/image/tab_1.png" info2_startX info_2Y - "ROOT/ui/page_03_summary/pic_summary_tab.png" + "ROOT/taobin_project/image/tab_1.png" info2_startX info_3Y - "ROOT/ui/page_03_summary/pic_summary_tab.png" + "ROOT/taobin_project/image/tab_1.png" info2_startX info_4Y - "ROOT/ui/page_03_summary/pic_summary_tab.png" + "ROOT/taobin_project/image/tab_1.png" info2_startX info_5Y - "ROOT/ui/page_03_summary/pic_summary_tab.png" + "ROOT/taobin_project/image/tab_1.png" Open "ROOT/xml/test_coin.xml" @@ -238,8 +247,8 @@