From 8ab45927a4b05fa48dfc764e6e83ba8d82665d84 Mon Sep 17 00:00:00 2001 From: Pakin Date: Wed, 22 Jan 2025 13:10:05 +0700 Subject: [PATCH] SGP: update page drink fail & import block order from topping select 7 --- .../sgp/xml/page_drinkfail3-SGP_blue.xml | 62 +------ .../sgp/xml/page_topping_select6_blue.lxml | 167 ++++++++++++++++++ 2 files changed, 170 insertions(+), 59 deletions(-) diff --git a/inter/whatthecup/sgp/xml/page_drinkfail3-SGP_blue.xml b/inter/whatthecup/sgp/xml/page_drinkfail3-SGP_blue.xml index e9471aca..a5446b63 100644 --- a/inter/whatthecup/sgp/xml/page_drinkfail3-SGP_blue.xml +++ b/inter/whatthecup/sgp/xml/page_drinkfail3-SGP_blue.xml @@ -54,84 +54,28 @@ DEBUGVAR NextOrder DEBUGVAR HaveCup - If Door_Open_flagBlink = 0 Then - Var Door_Open_flagBlink = 1 - Var Door_Open_State="Enable" - Else - Var Door_Open_flagBlink = 0 - Var Door_Open_State="Invisible" - EndIf - If HaveCup = "true" Then - DEBUGVAR CheckCupStateDoorCupClose - - If CheckCupStateDoorCupClose = "" Then - Var buttonRemoveCup = "Enable" - EndIf - - If CheckCupStateDoorCupClose = "done" Then - Var buttonRemoveCup = "Enable" - EndIf - - If CheckCupStateDoorCupClose = "reset" Then - - If CheckCupStateDoorCupCloseCnt = 0 Then - Var CheckCupStateDoorCupClose = "" - Else - Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1 - - EndIf - EndIf - Else - If buttonRemoveCup = "Enable" Then - Var buttonRemoveCup = "Invisible" - EndIf - EndIf - - If buttonRemoveCup = "Invisible" Then - Var Door_Open_State = "Invisible" - EndIf DEBUGVAR buttonRemoveCup DEBUGVAR Door_Open_State - If MachineStage = "remove-cup" Then - Else - If NextOrder = "true" Then + If NextOrder = "true" Then Var NextOrder = "false" TransferVar "next" "curr" Var Seeker = "curr" - SAVELOG "Remove cup" + SAVELOG "Have Cup 2" Open "ROOT/taobin_project/xml/page_thankyouConti.xml" Else Open "ROOT/taobin_project/xml/page_back_to_main.xml" EndIf - EndIf - ; must remove cup. - If HaveCup = "true" Then - - Else - If NextOrder = "true" Then - Var NextOrder = "false" - - TransferVar "next" "curr" - Var Seeker = "curr" - - SAVELOG "Have Cup" - - Open "ROOT/taobin_project/xml/page_thankyouConti.xml" - Else - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - If Timeout > 240 Then + If Timeout > 120 Then If NextOrder = "true" Then SAVELOG "TIME OUT 240" Var NextOrder = "false" diff --git a/inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml b/inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml index 9f643d59..af4b0c4d 100644 --- a/inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml +++ b/inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml @@ -7,10 +7,18 @@ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + Var TextSelfTestCntColor = WTCSemiMediumBlueColor Var UserSeletedSugar = 0 SAVELOG "Event Open Select 6 SGP" + If NoWaitMachineEnable = 1 Then + Var ConfirmDrinkButtonState = "Enable" + Else + + Var ConfirmDrinkButtonState = "Invisible" + EndIf + Var y_topping_bg = 912 Var CHECK_EventOpen_Double = CHECK_EventOpen_Double + 1 @@ -304,12 +312,16 @@ Var showname = aliasName[LanguageShowByIndex] Var showdesc = aliasName[LanguageShowByIndex] + Var MenuReason = "" + BackslashNToEnter showname BackslashNToEnter showdesc CRLFToSpace showname CRLFToSpace showdesc + Var MenuReasonStage = "Invisible" + Var text_milk_choice_price_x = 265 Var SugarSoundFlag = 0 @@ -338,6 +350,40 @@ DEBUGVAR Timeout + DEBUGVAR MenuReady + DEBUGVAR CupRemain + + + If CLOSE_ORDER_NOW = "true" Then + ;include="ROOT/taobin_project/inc/return_condition.ev" + EndIf + + + If NoWaitMachineEnable = 1 Then + DEBUGVAR MachineStage + DEBUGVAR ConfirmDrinkButtonState + If MachineStage = "close-maintenance" Then + Var ConfirmDrinkButtonState = "Enable" + + If stop_now = "true" Then + SAVELOG "stop_now is true page_topping_select6_blue.xml" + ;include="ROOT/taobin_project/inc/return_condition.ev" + EndIf + Else + Var ConfirmDrinkButtonState = "Invisible" + EndIf + + EndIf + + If CLOSE_ORDER_NOW = "true" Then + SAVELOG "DEACTIVE in page_topping_select6_blue.xml" + ;include="ROOT/taobin_project/inc/return_condition.ev" + EndIf + + If SELLSTATUS = "DEACTIVE" Then + SAVELOG "DEACTIVE in page_topping_select6_blue.xml" + ;include="ROOT/taobin_project/inc/return_condition.ev" + EndIf Var Timeout = Timeout + 1 @@ -372,6 +418,70 @@ EndIf EndIf + DEBUGVAR MenuReason + ; arm-not-ready + ; brew-stg + ; door-cup-alert + ; stop-now-set + + If show_eng = "true" Then + If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then + Var ShowTextSelfTestCountDown = "Please wait a moment (" + MACHINE_SELF_TEST_COUNT_DOWN + Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")" + Else + Var ShowTextSelfTestCountDown = "Please wait a moment" + EndIf + + Else + If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then + Var ShowTextSelfTestCountDown ="กรุณารอสักครู่ (" + MACHINE_SELF_TEST_COUNT_DOWN + Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")" + Else + Var ShowTextSelfTestCountDown ="กรุณารอสักครู่" + EndIf + + EndIf + + If Seeker = "curr" Then + If MenuReason = "arm-not-ready" Then + + SAVELOG "goto mode arm-not-ready" + DEBUGVAR DoorCupPosition + + If DoorCupPosition = "bottom" Then + Machine RemoveCup + Machine DoorLidOpen + Else + Var TextSelfTestCntColor = HeadlineColor + Var ConfirmDrinkButtonState = "Enable" + + If show_eng = "true" Then + Var ShowTextSelfTestCountDown = "Please take out the glass." + Else + Var ShowTextSelfTestCountDown = "กรุณานําแก้วออก" + EndIf + EndIf + EndIf + EndIf + + If MenuReason = "brew-stg" Then + Var ConfirmDrinkButtonState = "Enable" + If Timeout > 15 Then + Var MenuReason = "-" + Var Timeout = 0 + Var ConfirmDrinkButtonState = "Invisible" + EndIf + + EndIf + + + If MenuReason = "-" Then + + Else + Var MenuReasonString = MenuReason + Var MenuReasonStage = "Enable" + EndIf + Refresh TimerReset @@ -4025,6 +4135,38 @@ PriceDrinkTmpShow +; next2 button Protect + + 0 380 @@ -4152,7 +4294,32 @@ + + 1 + 1 + KanitTTF + 22 + 1080 + end + 0xFF0000 + "#71" + + + + 0 + 1888 + MenuReasonStage + KanitTTF + 22 + 1078 + end + 0xFF0000 + MenuReasonString + + + ; + DEBUGVAR SELLSTATUS