diff --git a/xml/page_board.xml b/xml/page_board.xml index 0ec736bb..84fe56ba 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -522,6 +522,7 @@ Var web_readyOK = web_ready Var web_telnumOK = web_telnum + Var web_app_prepar = "true" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" @@ -668,10 +669,21 @@ ShowNetworkProblemText +; +; 795 +; 1010 +; 278 +; "0xeae6e1" +; 278 +; WebAppShow +; testservice +; + 895 1110 178 + "0xeae6e1" 178 WebAppShow testservice diff --git a/xml/page_lid_straw.xml b/xml/page_lid_straw.xml index f12ae461..d9e718cd 100644 --- a/xml/page_lid_straw.xml +++ b/xml/page_lid_straw.xml @@ -75,13 +75,12 @@ - If lidAndStrawOldPageIgnore = "true" Then - Var lidAndStrawOldPageIgnore = "false" - - + ;If lidAndStrawOldPageIgnore = "true" Then + ; Var lidAndStrawOldPageIgnore = "false" + Open "ROOT/taobin_project/xml/page_brewing3.xml" - EndIf + ;EndIf Var LidState = Lid1Status ;Lid1Status diff --git a/xml/page_payment.xml b/xml/page_payment.xml index 0771a02a..cbc5a9a4 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -86,6 +86,11 @@ Var MachineStage = "-" Var PayReference = "" + + If web_app_prepar = "true" Then + Var web_app_prepar = "false" + __CMD "ui-load-playlist" 0 SelectDrink "-" + EndIf diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 9e161849..ab1bb3ad 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -95,8 +95,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "5.78" - Var XMLPageVersionInt = 578 + Var XMLPageVersion = "5.79" + Var XMLPageVersionInt = 579