diff --git a/xml/page_board.xml b/xml/page_board.xml index 6727d092..f64f5a14 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -205,12 +205,16 @@ If SystemDateMonth = 11 Then If SystemDateDay > 1 Then - Var EventTurnOn = 2 + If SystemDateDay < 10 Then + Var EventTurnOn = 2 + EndIf EndIf EndIf + + If EventTurnOn = 1 Then Var ShowButtonClickFull = "Invisible" Var CountDownShowButton = 0 diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index e3c762f3..378f0a6e 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -55,6 +55,9 @@ Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw_en.png" Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw_en.png" + Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw_en.png" + Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw_en.png" + Var XStraw = 336 Else ;Var DirImage = "ROOT/taobin_project/image/collect_point1" @@ -66,6 +69,9 @@ Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw.png" Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw.png" + Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw.png" + Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw.png" + Var XStraw = 382 EndIf @@ -256,6 +262,7 @@ ; Hide Var bg_strawlid_ST = "Invisible" Var bg_strawProblem_ST = "Invisible" + Var StrawProblemStatus = 1 Var StrawStateX = "Invisible" Var LidStateX = "Invisible" @@ -1107,6 +1114,14 @@ EndIf EndIf + If GetMoreStrawCount <= 0 Then + + If StrawProblemStatus = 1 Then + Var StrawProblemStatus = 2 + Var bg_strawProblem_ST = "Enable" + EndIf + + EndIf Refresh TimerReset @@ -1336,6 +1351,23 @@ +