From d376233a2df9af41b97f0a5d29669d9bf2dc73d8 Mon Sep 17 00:00:00 2001 From: kong Date: Tue, 30 Nov 2021 15:42:42 +0700 Subject: [PATCH 1/3] DO --- xml/page_board.xml | 3 ++- xml/page_lid_straw.xml | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xml/page_board.xml b/xml/page_board.xml index 6099f30b..83b839e4 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -516,7 +516,7 @@ DEBUGVAR web_ready If web_ready = "true" Then - If web_ref = QRCODE99 Then + If web_ref = QRCODE99x Then Var web_readyOK = web_ready Var web_telnumOK = web_telnum @@ -671,6 +671,7 @@ 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 From edc9f9f28c72593f5739931803d33363ee04792e Mon Sep 17 00:00:00 2001 From: kong Date: Tue, 30 Nov 2021 16:16:44 +0700 Subject: [PATCH 2/3] Adjust and action --- xml/page_board.xml | 11 +++++++++++ xml/page_payment.xml | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/xml/page_board.xml b/xml/page_board.xml index f5f14326..45952083 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,6 +669,16 @@ ShowNetworkProblemText +; +; 795 +; 1010 +; 278 +; "0xeae6e1" +; 278 +; WebAppShow +; testservice +; + 895 1110 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 From a99f62a1f8cc7508d6536de50d56df2304f67cc7 Mon Sep 17 00:00:00 2001 From: kong Date: Tue, 30 Nov 2021 16:22:19 +0700 Subject: [PATCH 3/3] Release 5.79 webapp --- xml_main/startup.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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