From 7a3b36e4e52117298549ada7eac661d13046cd66 Mon Sep 17 00:00:00 2001 From: miggaze Date: Fri, 4 Dec 2020 13:35:13 +0700 Subject: [PATCH] ... --- xml/page_board.xml | 13 +++++++++++-- xml/page_brewing2.xml | 17 +++++++++++++++++ xml/page_payment_cash.xml | 6 ++++++ xml/page_thankyou.xml | 5 +++++ 4 files changed, 39 insertions(+), 2 deletions(-) diff --git a/xml/page_board.xml b/xml/page_board.xml index 43b648f3..d6ac2018 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -56,6 +56,11 @@ EndIf + Var TestLoopMakeDrink = 0 + Var TestLoopSuccess = 0 + Var TestLoopFailed = 0 + + @@ -63,6 +68,8 @@ 800 + + If MachineStage = "close-maintenance" Then Open "ROOT/taobin_project/xml/page_show_error.xml" @@ -132,7 +139,9 @@ Var countClick = countClick + 1 If countClick = 3 Then - + + Var TestLoopMakeDrink = 1 + EndIf If countClick = 5 Then @@ -205,7 +214,7 @@ 0 - 1886 + 1860 20 1080 Center diff --git a/xml/page_brewing2.xml b/xml/page_brewing2.xml index a22bbb29..56e1204e 100644 --- a/xml/page_brewing2.xml +++ b/xml/page_brewing2.xml @@ -219,6 +219,23 @@ EndIf + If TestLoopMakeDrink = 1 Then + + If MachineState_Result = 1 Then + Var MachineState_Result = 0 + Var TestLoopSuccess = TestLoopSuccess + 1 + Open "ROOT/taobin_project/xml/page_drinkloop.xml" + EndIf + + If MachineState_Result = 2 Then + ;Var MachineState_Result = 0 + Var TestLoopFailed = TestLoopFailed + 1 + Open "ROOT/taobin_project/xml/page_drinkloop.xml" + EndIf + + EndIf + + If MachineState_Result = 1 Then Var Timeout = 0 Var ProcessText = "" diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index c4742b3c..6069d3c7 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -301,6 +301,12 @@ EndIf Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf + + + If TestLoopMakeDrink = 1 Then + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 5a2ae3ad..7eb8a72a 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -62,6 +62,11 @@ If CountDownThankyou = 0 Then ;Open "ROOT/taobin_project/xml/page_lid_straw.xml" ;Open "ROOT/taobin_project/xml/page_brewing.xml" + + If TestLoopMakeDrink = 1 Then + Open "ROOT/taobin_project/xml/page_brewing2.xml" + EndIf + Open "ROOT/taobin_project/xml/page_collect_point_1.xml" EndIf