From 3efc439f6bdc1fd3a421c49a9b14dfdae1def63c Mon Sep 17 00:00:00 2001 From: miggaze Date: Wed, 28 Oct 2020 13:43:30 +0700 Subject: [PATCH 1/3] ... --- xml/page_lid_straw.xml | 11 +++++++++++ xml/page_payment_code.xml | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/xml/page_lid_straw.xml b/xml/page_lid_straw.xml index 7ee36c29..f4f9ad46 100644 --- a/xml/page_lid_straw.xml +++ b/xml/page_lid_straw.xml @@ -183,9 +183,20 @@ If MachineStage = "drink-failed" Then + Var MachineState_Result = 1 Open "ROOT/taobin_project/xml/page_brewing2.xml" EndIf + + If MachineStage = "drink-success" Then + Var MachineState_Result = 1 + EndIf + + If MachineStage = "drink-failed" Then + Var MachineState_Result = 2 + EndIf + + diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index 93ad35ec..f92be798 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -126,6 +126,8 @@ Var ShowErrorText = "Enable" + Var GetPayInfoFlag = 0 + Var CodeChannel = 0 EndIf @@ -149,6 +151,8 @@ If CodeChannel = 1 Then Var TelephoneNumber = "" Var ShowErrorText = "Enable" + Var GetPayInfoFlag = 0 + Var CodeChannel = 0 Refresh EndIf From e49686f66d293e99b34e737786c661cfe8fb2eef Mon Sep 17 00:00:00 2001 From: miggaze Date: Wed, 28 Oct 2020 15:10:40 +0700 Subject: [PATCH 2/3] ... --- xml/page_payment_cash.xml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index cdae17aa..8c3b7742 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -644,10 +644,20 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var alphaState = "Invisible" - CoinVending ON - VendingQR OFF - Refresh + + If CoinAmount = 0 Then + Var alphaState = "Invisible" + CoinVending ON + VendingQR OFF + Else + VendingQR OFF + If CancelFlag = 0 Then + Var CancelFlag = 1 + Var CancelCounter = 0 + EndIf + + EndIf + Refresh From e8c55750a4d327b378347127b248ebec61a42ecc Mon Sep 17 00:00:00 2001 From: miggaze Date: Wed, 28 Oct 2020 15:16:37 +0700 Subject: [PATCH 3/3] ... --- xml/page_payment_cash.xml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 8c3b7742..cdae17aa 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -644,20 +644,10 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - - If CoinAmount = 0 Then - Var alphaState = "Invisible" - CoinVending ON - VendingQR OFF - Else - VendingQR OFF - If CancelFlag = 0 Then - Var CancelFlag = 1 - Var CancelCounter = 0 - EndIf - - EndIf - Refresh + Var alphaState = "Invisible" + CoinVending ON + VendingQR OFF + Refresh