From 381504cd606272a7f05c2ce0dedd552ae4c92ada Mon Sep 17 00:00:00 2001 From: kong Date: Wed, 11 May 2022 15:57:41 +0700 Subject: [PATCH] Release 6.35 and 6.42 --- xml/page_board.xml | 4 +- xml/page_drinkfail3.xml | 29 ++++--- xml/page_thankyouConti.xml | 143 ++++++++++++++++++++++---------- xml_main/startup.xml | 4 +- xml_main/startup.xml_new_layout | 4 +- 5 files changed, 122 insertions(+), 62 deletions(-) diff --git a/xml/page_board.xml b/xml/page_board.xml index 746cbdd0..2a0a59d3 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -406,10 +406,10 @@ READ_FILE "/mnt/sdcard/new_layout" new_layout - DEBUGVAR JXMLVersionInt + DEBUGVAR XMLPageVersionInt - If JXMLVersionInt > 389 Then + If XMLPageVersionInt > 640 Then Var new_layout = "true" EndIf diff --git a/xml/page_drinkfail3.xml b/xml/page_drinkfail3.xml index 294e604f..eccc5c4b 100644 --- a/xml/page_drinkfail3.xml +++ b/xml/page_drinkfail3.xml @@ -34,17 +34,21 @@ Var Timeout = Timeout + 1 - ;If Timeout > 10 Then - If Timeout > 240 Then - If NextOrder = "true" Then - Var NextOrder = "false" + If NextOrder = "true" Then - TransferVar "next" "curr" - Var Seeker = "curr" - - Open "ROOT/taobin_project/xml/page_thankyouConti.xml" - Else - Open "ROOT/taobin_project/xml/page_back_to_main.xml" + Else + If Timeout > 240 Then + If NextOrder = "true" Then + SAVELOG "TIME OUT 240" + Var NextOrder = "false" + + TransferVar "next" "curr" + Var Seeker = "curr" + + Open "ROOT/taobin_project/xml/page_thankyouConti.xml" + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf EndIf EndIf @@ -65,6 +69,8 @@ TransferVar "next" "curr" Var Seeker = "curr" + + SAVELOG "Remove cup" Open "ROOT/taobin_project/xml/page_thankyouConti.xml" Else @@ -72,6 +78,7 @@ EndIf EndIf + ; must remove cup. If HaveCup = "true" Then Else @@ -80,6 +87,8 @@ TransferVar "next" "curr" Var Seeker = "curr" + + SAVELOG "Have Cup" Open "ROOT/taobin_project/xml/page_thankyouConti.xml" Else diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml index 6a1fa504..d242c753 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -105,61 +105,86 @@ EndIf - - If SaveTheWorldCount = 2 Then - - If LedLidBlink = "no" Then - Var SaveTheWorldST = "Enable" - EndIf - - Var video_id_to_ran = 3 - Var video_name_to_play = "taobin_save_world" - Random video_id_to_ran - Var ThankyouST = "Invisible" - Else - - Var video_id_to_ran = 2 - Var video_name_to_play = "taobin_thank" - Random video_id_to_ran - Var ThankyouST = "Enable" - EndIf - - - If new_layout = "true" Then - - DEBUGVAR video_id_to_ran - - Var show_video = 1 - Var SaveTheWorldST = "Invisible" - Var video_file_name = "ROOT/taobin_project/video/" + video_name_to_play - Var video_file_name = video_file_name + video_id_to_ran - Var video_file_name = video_file_name + ".mp4" - - - DEBUGVAR video_file_name - - Var VideoFileNameStage = "Enable" - Var TimeoutToNext = 5 - Var ThankyouST = "Invisible" - Else - Var show_video = 0 - Var VideoFileNameStage = "Invisible" - Var TimeoutToNext = 3 - - EndIf - DEBUGVAR LastMakeDrinkResult DEBUGVAR MachineStage DEBUGVAR NextOrderStatus + ; Show text and button for remove CUP. + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/complete_en/" + Else + Var DirImage2 = "ROOT/taobin_project/image/complete/" + EndIf + + Var txtDrinkOKState = "Invisible" + Var buttonRemoveCup = "Invisible" + + 1000 Var CountDownBrewing = CountDownBrewing - 1 - Var CountDownThankyou = CountDownThankyou - 1 + ;Var CountDownThankyou = CountDownThankyou - 1 - Var Timeout = Timeout + 1 - If Timeout = 1 Then + DEBUGVAR MachineStage + DEBUGVAR CupOnArm + DEBUGVAR buttonRemoveCup + DEBUGVAR CART_COUNT + + + DEBUGVAR HaveCup + DEBUGVAR CHECKCUP + DEBUGVAR CupChecking + DEBUGVAR MaybeHaveCup + DEBUGVAR NextOrder + DEBUGVAR DoorCupPosition + + If HaveCup = "true" Then + Var Timeout = 0 + Else + If CupOnArm = "true" Then + Var Timeout = 0 + Else + If MaybeHaveCup = "true" Then + Var Timeout = 0 + Else + Var Timeout = Timeout + 1 + EndIf + EndIf + EndIf + + ; detect cup + If DoorCupPosition = "bottom" Then + If HaveCup = "true" Then + If MaybeHaveCup = "true" Then + + Else + If CupChecking = "true" Then + + Else + Var buttonRemoveCup = "Enable" + Var txtDrinkOKState = "Enable" + EndIf + EndIf + EndIf + + If CupOnArm = "true" Then + If MaybeHaveCup = "true" Then + + Else + If CupChecking = "true" Then + + Else + Var buttonRemoveCup = "Enable" + Var txtDrinkOKState = "Enable" + EndIf + EndIf + EndIf + Else + Var buttonRemoveCup = "Invisible" + EndIf + + If Timeout = 2 Then Var VideoPlayFile = VideoPath @@ -179,6 +204,7 @@ Else MakeDrinkV1 Seeker.selected_a_drink SelectSugarID + Var CountDownThankyou = 0 EndIf Else ;Cart "MakeID" CART_INDEX @@ -192,6 +218,7 @@ ; run test; If CountDownThankyou = 0 Then + ; reset all var DEBUGVAR MachineStage Var CountDownBrewing = BrewTime @@ -252,4 +279,28 @@ + + 77 + 1378 + txtDrinkOKState + Var( DirImage + "/txtDrinkOK.png" ) + + + + + diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 696af3ab..fe927b6e 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -95,8 +95,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "6.34" - Var XMLPageVersionInt = 634 + Var XMLPageVersion = "6.35" + Var XMLPageVersionInt = 635 diff --git a/xml_main/startup.xml_new_layout b/xml_main/startup.xml_new_layout index 44eaada2..58b5f543 100644 --- a/xml_main/startup.xml_new_layout +++ b/xml_main/startup.xml_new_layout @@ -95,8 +95,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "6.41" - Var XMLPageVersionInt = 641 + Var XMLPageVersion = "6.42" + Var XMLPageVersionInt = 642