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/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/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/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_drinkok.xml b/xml/page_drinkok.xml index b99e7774..113a4b37 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -18,7 +18,7 @@ EndIf - 1000 + 800 If HaveCup = "false" Then diff --git a/xml/page_lid_straw.xml b/xml/page_lid_straw.xml index 70c2d119..8836bb05 100644 --- a/xml/page_lid_straw.xml +++ b/xml/page_lid_straw.xml @@ -9,7 +9,7 @@ ; On open Var LidState = Lid1Status Var StarwState = "Enable" - Var LidStrawCountDown = 15 + Var LidStrawCountDown = 10 If show_eng = "true" Then @@ -20,7 +20,7 @@ EndIf - 1000 + 800 Var CountDownBrewing = CountDownBrewing - 1 @@ -33,7 +33,7 @@ Var LidStrawCountDown = LidStrawCountDown - 1 ; count down If LidStrawCountDown = 1 Then - Var LidStrawCountDown = 15 + Var LidStrawCountDown = 10 Open "ROOT/taobin_project/xml/page_brewing2.xml" EndIf diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index 803cc740..64a2e031 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -591,6 +591,7 @@ 244 817 ShowTextNumber + "Enable" Var( DirImage + "/text_12.png" ) diff --git a/xml/page_topping_alter.xml b/xml/page_topping_alter.xml index 0f42d2ec..982af1cc 100644 --- a/xml/page_topping_alter.xml +++ b/xml/page_topping_alter.xml @@ -37,14 +37,15 @@ Var BugFlag = 0 If show_eng = "true" Then - ;Var DirImage = "ROOT/taobin_project/image/page2_en/page2" + + 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/page2" + 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 @@ -77,14 +78,15 @@ EndIf If show_eng = "true" Then - ;Var DirImage = "ROOT/taobin_project/image/page2_en/page2" + + 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/page2" + 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 @@ -199,8 +201,8 @@