diff --git a/image/consent_idcard/img_popup1.png b/image/consent_idcard/img_popup1.png new file mode 100644 index 00000000..6fdcf6dc Binary files /dev/null and b/image/consent_idcard/img_popup1.png differ diff --git a/image/consent_idcard_en/img_popup1.png b/image/consent_idcard_en/img_popup1.png new file mode 100644 index 00000000..9646ab1b Binary files /dev/null and b/image/consent_idcard_en/img_popup1.png differ diff --git a/image/display_disqualified/alpha.png b/image/display_disqualified/alpha.png new file mode 100644 index 00000000..f653b2a5 Binary files /dev/null and b/image/display_disqualified/alpha.png differ diff --git a/image/display_disqualified/bn_accept.png b/image/display_disqualified/bn_accept.png new file mode 100644 index 00000000..582eddcb Binary files /dev/null and b/image/display_disqualified/bn_accept.png differ diff --git a/image/display_disqualified/bp_accept.png b/image/display_disqualified/bp_accept.png new file mode 100644 index 00000000..7bbfbd6a Binary files /dev/null and b/image/display_disqualified/bp_accept.png differ diff --git a/image/display_disqualified/img_popup1.png b/image/display_disqualified/img_popup1.png new file mode 100644 index 00000000..d4e0c5bc Binary files /dev/null and b/image/display_disqualified/img_popup1.png differ diff --git a/image/display_disqualified_en/alpha.png b/image/display_disqualified_en/alpha.png new file mode 100644 index 00000000..f653b2a5 Binary files /dev/null and b/image/display_disqualified_en/alpha.png differ diff --git a/image/display_disqualified_en/bn_accept.png b/image/display_disqualified_en/bn_accept.png new file mode 100644 index 00000000..582eddcb Binary files /dev/null and b/image/display_disqualified_en/bn_accept.png differ diff --git a/image/display_disqualified_en/bp_accept.png b/image/display_disqualified_en/bp_accept.png new file mode 100644 index 00000000..0a13fd2b Binary files /dev/null and b/image/display_disqualified_en/bp_accept.png differ diff --git a/image/display_disqualified_en/img_popup1.png b/image/display_disqualified_en/img_popup1.png new file mode 100644 index 00000000..c1714543 Binary files /dev/null and b/image/display_disqualified_en/img_popup1.png differ diff --git a/image/display_got_free/alpha.png b/image/display_got_free/alpha.png new file mode 100644 index 00000000..f653b2a5 Binary files /dev/null and b/image/display_got_free/alpha.png differ diff --git a/image/display_got_free/bn_accept.png b/image/display_got_free/bn_accept.png new file mode 100644 index 00000000..582eddcb Binary files /dev/null and b/image/display_got_free/bn_accept.png differ diff --git a/image/display_got_free/bp_accept.png b/image/display_got_free/bp_accept.png new file mode 100644 index 00000000..19e88108 Binary files /dev/null and b/image/display_got_free/bp_accept.png differ diff --git a/image/display_got_free/img_popup1.png b/image/display_got_free/img_popup1.png new file mode 100644 index 00000000..00522f0f Binary files /dev/null and b/image/display_got_free/img_popup1.png differ diff --git a/image/display_got_free_en/alpha.png b/image/display_got_free_en/alpha.png new file mode 100644 index 00000000..f653b2a5 Binary files /dev/null and b/image/display_got_free_en/alpha.png differ diff --git a/image/display_got_free_en/bn_accept.png b/image/display_got_free_en/bn_accept.png new file mode 100644 index 00000000..7e1b45ac Binary files /dev/null and b/image/display_got_free_en/bn_accept.png differ diff --git a/image/display_got_free_en/bp_accept.png b/image/display_got_free_en/bp_accept.png new file mode 100644 index 00000000..3c2f78ab Binary files /dev/null and b/image/display_got_free_en/bp_accept.png differ diff --git a/image/display_got_free_en/img_popup1.png b/image/display_got_free_en/img_popup1.png new file mode 100644 index 00000000..6d37b84d Binary files /dev/null and b/image/display_got_free_en/img_popup1.png differ diff --git a/image/page3/bn_bestseller.png b/image/page3/bn_bestseller.png index 1f56dd54..52f7f5ff 100644 Binary files a/image/page3/bn_bestseller.png and b/image/page3/bn_bestseller.png differ diff --git a/image/page3/bn_cho_ca.png b/image/page3/bn_cho_ca.png index fa9c37c5..258d33f8 100644 Binary files a/image/page3/bn_cho_ca.png and b/image/page3/bn_cho_ca.png differ diff --git a/image/page3/bn_coffee.png b/image/page3/bn_coffee.png index 28e98c60..b0eeb284 100644 Binary files a/image/page3/bn_coffee.png and b/image/page3/bn_coffee.png differ diff --git a/image/page3/bn_fruit.png b/image/page3/bn_fruit.png index 237dd77a..bbf8af43 100644 Binary files a/image/page3/bn_fruit.png and b/image/page3/bn_fruit.png differ diff --git a/image/page3/bn_sodada.png b/image/page3/bn_sodada.png index fc42d350..59dbe014 100644 Binary files a/image/page3/bn_sodada.png and b/image/page3/bn_sodada.png differ diff --git a/image/page3/bn_tea.png b/image/page3/bn_tea.png index 6e44dc12..a00ef705 100644 Binary files a/image/page3/bn_tea.png and b/image/page3/bn_tea.png differ diff --git a/image/page3/bp_bestseller.png b/image/page3/bp_bestseller.png index 648b767e..813c0818 100644 Binary files a/image/page3/bp_bestseller.png and b/image/page3/bp_bestseller.png differ diff --git a/image/page_drink_select/bn_iced_7up.png b/image/page_drink_select/bn_iced_7up.png new file mode 100644 index 00000000..a13ff143 Binary files /dev/null and b/image/page_drink_select/bn_iced_7up.png differ diff --git a/image/page_drink_select/bn_iced_sprite.png b/image/page_drink_select/bn_iced_sprite.png index 29e9030e..143704a3 100644 Binary files a/image/page_drink_select/bn_iced_sprite.png and b/image/page_drink_select/bn_iced_sprite.png differ diff --git a/image/page_payment_cash_extend/bn_cancel.png b/image/page_payment_cash_extend/bn_cancel.png new file mode 100644 index 00000000..7b4e12ec Binary files /dev/null and b/image/page_payment_cash_extend/bn_cancel.png differ diff --git a/image/page_payment_cash_extend/bp_cancel.png b/image/page_payment_cash_extend/bp_cancel.png new file mode 100644 index 00000000..f1409ce4 Binary files /dev/null and b/image/page_payment_cash_extend/bp_cancel.png differ diff --git a/image/page_payment_cash_extend/img_popup11.png b/image/page_payment_cash_extend/img_popup11.png new file mode 100644 index 00000000..0623b37b Binary files /dev/null and b/image/page_payment_cash_extend/img_popup11.png differ diff --git a/image/page_payment_cash_extend_en/bn_cancel.png b/image/page_payment_cash_extend_en/bn_cancel.png new file mode 100644 index 00000000..c6853977 Binary files /dev/null and b/image/page_payment_cash_extend_en/bn_cancel.png differ diff --git a/image/page_payment_cash_extend_en/bp_cancel.png b/image/page_payment_cash_extend_en/bp_cancel.png new file mode 100644 index 00000000..1ddebdc1 Binary files /dev/null and b/image/page_payment_cash_extend_en/bp_cancel.png differ diff --git a/image/page_payment_cash_extend_en/img_popup11.png b/image/page_payment_cash_extend_en/img_popup11.png new file mode 100644 index 00000000..137ccdcc Binary files /dev/null and b/image/page_payment_cash_extend_en/img_popup11.png differ diff --git a/xml/page_board.xml b/xml/page_board.xml index 28f03b1f..c51b4dcd 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -192,7 +192,7 @@ 610 ShowButtonClickFull 1070 - 1200 + 1100 "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -215,5 +215,18 @@ + + + diff --git a/xml/page_brewing2.xml b/xml/page_brewing2.xml index 4271bc2e..1f71c60e 100644 --- a/xml/page_brewing2.xml +++ b/xml/page_brewing2.xml @@ -477,17 +477,17 @@ ShowCountDownBrewing - - 100 - 470 - End - 153 - 30 - RobotoBold - 0x513C2F - MachineStage - - +; +; 100 +; 470 +; End +; 153 +; 30 +; RobotoBold +; 0x513C2F +; MachineStage +; +; diff --git a/xml/page_catalog_choose_drink1.pml b/xml/page_catalog_choose_drink1.pml index 99094300..9f2e3ce3 100644 --- a/xml/page_catalog_choose_drink1.pml +++ b/xml/page_catalog_choose_drink1.pml @@ -3,58 +3,27 @@ ?> diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml index c6cd5332..6711c672 100644 --- a/xml/page_catalog_choose_drink1.xml +++ b/xml/page_catalog_choose_drink1.xml @@ -186,156 +186,180 @@ 497 1080 1500 - 1400 + 1650 "Vertical" - ; button i=1 11-99-02-0006 + ; button i=1 11-99-01-0001 - ; button i=2 11-99-02-0001 + ; button i=2 11-99-01-0002 - ; button i=3 11-99-02-0003 + ; button i=3 11-99-01-0003 - ; button i=4 11-99-02-0007 + ; button i=4 11-99-02-0005 - ; button i=5 11-99-02-0002 + ; button i=5 11-99-02-0013 - ; button i=6 11-99-01-0004 + ; button i=6 11-99-02-0014 - ; button i=7 11-99-02-0020 + ; button i=7 11-99-02-0018 + ; button i=8 11-99-02-0020 + - ; button i=8 11-99-02-0017 + ; button i=9 11-99-02-0017 - ; button i=9 11-99-01-0017 + ; button i=10 11-99-02-0023 - ; button i=10 11-99-02-0018 + ; button i=11 11-99-02-0024 + ; button i=12 11-99-02-0033 + + ; button i=13 11-99-02-0051 + + ; button i=14 11-99-02-0039 + + ; button i=15 11-99-02-0038 + + ; button i=16 11-99-02-0035 + - ; button i=13 11-99-02-0021 + ; button i=13 11-99-02-0022 - ; button i=14 11-99-02-0022 - - ; button i=15 11-99-02-0023 + ; button i=14 11-99-02-0023 - ; button i=16 11-99-02-0024 + ; button i=15 11-99-02-0024 - ; button i=17 11-99-02-0025 + ; button i=16 11-99-02-0025 - ; button i=18 11-99-02-0026 + ; button i=17 11-99-02-0026 +; begin cash popup + + 0 + 380 + alphaState2 + "ROOT/taobin_project/image/page_payment/alpha.png" + + + + 182 + 748 + alphaState2 + Var( DirImage2 + "/img_popup11.png" ) + + + + + + 0 + 1041 + 144 + Center + 1080 + KanitRegularTTF + alphaState2 + 0xDE794E + RemainAmountStr + +; end case popup + 399 @@ -760,7 +823,7 @@ ;Var UnitTestType = "1" Var UnitTestType = "2" - Open "ROOT/taobin_project/xml/page_id_card_result.xml" + Open "ROOT/taobin_project/xml/page_show_consent2.xml" ;Open "ROOT/taobin_project/xml/page_payment_code.xml" diff --git a/xml/page_show_consent2.xml b/xml/page_show_consent2.xml index 3039d003..8761804c 100644 --- a/xml/page_show_consent2.xml +++ b/xml/page_show_consent2.xml @@ -13,12 +13,12 @@ SAVELOG show_eng If show_eng = "true" Then - Var DirImage = "ROOT/taobin_project/image/consent_en/" + Var DirImage = "ROOT/taobin_project/image/consent_idcard_en/" Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" Else - Var DirImage = "ROOT/taobin_project/image/consent/" + Var DirImage = "ROOT/taobin_project/image/consent_idcard/" Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" EndIf @@ -35,6 +35,13 @@ Open "ROOT/taobin_project/xml/page_payment_cash.xml" EndIf + ; add + If Timeout = 3 Then + ;page_disqualified_idcard + ;page_got_free_idcard + Open "ROOT/taobin_project/xml/page_got_free_idcard.xml" + EndIf + TimerReset Refresh @@ -45,9 +52,16 @@ Var IDValid = "" + + ; add + SAVELOG Ext1a + SPLIT Ext1a "|" 1 IDValid + ; add + Var IDValid = "ok" + If IDValid = "ok" Then Var FreeVendingCampaign = 1 @@ -59,7 +73,7 @@ Else - Open "ROOT/taobin_project/xml/page_payment_cash.xml" + Open "ROOT/taobin_project/xml/page_disqualified_idcard.xml" EndIf Refresh @@ -168,37 +182,7 @@ "ROOT/taobin_project/image/ad_medium_2.png" -; - - 751 - 413 - "ROOT/taobin_project/image/page_doing/img2.png" - -; - - - - -; - - 751 - 413 - "ROOT/taobin_project/image/page_doing/img2.png" - -; -; - - - XPosiShowCountDownBrew - 470 - End - 153 - 88 - RobotoBold - 0x513C2F - AcceptFlag - diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 8b3252b4..892b69ab 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -8,7 +8,7 @@ ; On open Var CountDownThankyou = 3 - Var CountDownBrewing = 99 + Var CountDownBrewing = BrewTime Var ShowCountDownBrewing = CountDownBrewing Var Timeout = 0 Var ChangeFlag = 0 diff --git a/xml/page_topping_alter.xml b/xml/page_topping_alter.xml index 4d7d9d39..0f42d2ec 100644 --- a/xml/page_topping_alter.xml +++ b/xml/page_topping_alter.xml @@ -40,17 +40,19 @@ ;Var DirImage = "ROOT/taobin_project/image/page2_en/page2" 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 = NameDrinkTH - Var showdesc = DrinkDescriptionTH + Var showname = NameDrink + Var showdesc = DrinkDescription Else ;Var DirImage = "ROOT/taobin_project/image/page2" 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 = NameDrink - Var showdesc = DrinkDescription + Var showname = NameDrinkTH + Var showdesc = DrinkDescriptionTH EndIf + CRLFToSpace showname + ;SAVELOG showname 30000 @@ -88,7 +90,7 @@ Var showname = NameDrinkTH Var showdesc = DrinkDescriptionTH EndIf - + CRLFToSpace showname RefreshAll diff --git a/xml/vending_info.xml b/xml/vending_info.xml index b187ef26..164ac0fe 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -52,6 +52,7 @@ Var ShowVersionAll = BrewMachineFirmwareVersion + " | " Var ShowVersionAll = ShowVersionAll + XMLPageVersion + Var IDCardState = "Invisible" Var Timeout = 0 @@ -223,6 +224,17 @@ + + info2_text_startX + info_text_4Y + 30 + IDCardState + fontType1 + 0x000000 + IDFullNameEng + + + + + Var IDCardState = "Enable" + + SAVELOG IDFullNameEng +