From 0479282586527f47f0f2821824b32af59e613c53 Mon Sep 17 00:00:00 2001 From: kong Date: Thu, 9 Dec 2021 15:24:23 +0700 Subject: [PATCH] Release --- xml/page_catalog.xml | 1 + xml/page_thankyou.xml | 6 ++++-- xml/page_thankyouMore.xml | 6 +++++- xml_main/startup.xml | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index 2e5967f2..0ad86ac2 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -13,6 +13,7 @@ Var web_readyOK = "false" Var web_telnumOK = "" + Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/" If CocktailShow = "true" Then Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml" diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index ae81df3e..9e78ccbb 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -35,15 +35,18 @@ Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + Var BottomText = PicturePath + "text_bottom_eng.png" Else Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2.png" Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + Var BottomText = PicturePath + "text_bottom_thai2.png" EndIf DEBUGVAR StarwState DEBUGVAR LidState - + DEBUGVAR BottomText + If StarwState = "Press" Then Machine StrawWithDelay LED LedDoorLid Blink 255 255 255 255 @@ -59,7 +62,6 @@ DEBUGVAR StoreCreditFlag - 1000 diff --git a/xml/page_thankyouMore.xml b/xml/page_thankyouMore.xml index e6eec5d7..050b9b28 100644 --- a/xml/page_thankyouMore.xml +++ b/xml/page_thankyouMore.xml @@ -30,15 +30,19 @@ Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2_eng.png" Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" - + Var BottomText = PicturePath + "text_bottom_eng.png" + Else Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2.png" Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + Var BottomText = PicturePath + "text_bottom_thai2.png" EndIf DEBUGVAR StarwState DEBUGVAR LidState + DEBUGVAR BottomText + If StarwState = "Press" Then Machine StrawWithDelay diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 87260906..77274c2a 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -95,8 +95,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "5.83" - Var XMLPageVersionInt = 583 + Var XMLPageVersion = "5.84" + Var XMLPageVersionInt = 584