From 97bdfd8ce2767d80218c89f6de0af03bda1d9ae2 Mon Sep 17 00:00:00 2001 From: kong Date: Tue, 9 Nov 2021 22:25:24 +0700 Subject: [PATCH] SNAP 5.71 --- xml/page_board.xml | 3 ++- xml/page_topping_select3.xml | 27 ++++++++++++++++++--------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/xml/page_board.xml b/xml/page_board.xml index 3036fe86..5c8424fe 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -623,7 +623,8 @@ Var countClick = 0 OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_free.xml" + ;OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_collect_point_1.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_tel_number_mask.xml" TopView "show" Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" diff --git a/xml/page_topping_select3.xml b/xml/page_topping_select3.xml index 66a0510f..b5ca691c 100644 --- a/xml/page_topping_select3.xml +++ b/xml/page_topping_select3.xml @@ -299,17 +299,20 @@ DEBUGVAR toppingID3price2 DEBUGVAR BrewParam - - Var SugarState1 = "Enable" - Var SugarState2 = "Enable" - Var SugarState3 = "Enable" - Var SugarState4 = "Enable" - Var SugarState5 = "Enable" - - If BugFlag = 1 Then Else + + + Var SugarState1 = "Enable" + Var SugarState2 = "Enable" + Var SugarState3 = "Enable" + Var SugarState4 = "Enable" + Var SugarState5 = "Enable" + + + + STRCONTAIN "9701" BrewParam IgnoreLidStraw DEBUGVAR BrewParam @@ -864,6 +867,8 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + DEBUGVAR SugarState1 + If ShiftSugarStep = 1 Then Var SugarState1 = "PressForever" @@ -1321,7 +1326,11 @@ Else Var LidState = "Press" EndIf + + + DEBUGVAR SugarState1 Refresh + @@ -1597,8 +1606,8 @@ SAVELOG PriceDrinkTmp + Var Timeout = 0 - Refresh