This commit is contained in:
wanlop run 2024-02-20 17:06:25 +07:00
parent 2145f624e8
commit f4389e579d
29 changed files with 39 additions and 87 deletions

View file

@ -43,7 +43,6 @@
EndIf
EndIf
@ -118,8 +117,6 @@
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR show_eng
RefreshAll
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile

View file

@ -209,7 +209,6 @@
EndIf
EndIf
@ -284,8 +283,6 @@
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR show_eng
RefreshAll
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile

View file

@ -201,7 +201,6 @@
EndIf
EndIf
@ -276,8 +275,6 @@
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR show_eng
RefreshAll
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile

View file

@ -210,7 +210,6 @@
EndIf
EndIf
@ -285,8 +284,6 @@
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR show_eng
RefreshAll
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile

View file

@ -201,7 +201,6 @@
EndIf
EndIf
@ -276,8 +275,6 @@
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR show_eng
RefreshAll
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile

View file

@ -199,7 +199,6 @@
EndIf
EndIf
@ -274,8 +273,6 @@
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR show_eng
RefreshAll
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile

View file

@ -197,7 +197,6 @@
EndIf
EndIf
@ -272,8 +271,6 @@
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR show_eng
RefreshAll
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile

View file

@ -200,7 +200,6 @@
EndIf
EndIf
@ -275,8 +274,6 @@
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR show_eng
RefreshAll
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile

View file

@ -197,7 +197,6 @@
EndIf
EndIf
@ -272,8 +271,6 @@
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR show_eng
RefreshAll
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile

View file

@ -219,7 +219,6 @@
EndIf
EndIf
@ -294,8 +293,6 @@
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR show_eng
RefreshAll
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile

View file

@ -195,7 +195,6 @@
EndIf
EndIf
@ -270,8 +269,6 @@
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR show_eng
RefreshAll
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile

View file

@ -198,7 +198,6 @@
EndIf
EndIf
@ -273,8 +272,6 @@
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR show_eng
RefreshAll
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile

View file

@ -226,7 +226,6 @@
EndIf
EndIf
@ -301,8 +300,6 @@
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR show_eng
RefreshAll
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile

View file

@ -199,7 +199,6 @@
EndIf
EndIf
@ -274,8 +273,6 @@
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR show_eng
RefreshAll
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile

View file

@ -218,7 +218,6 @@
EndIf
EndIf
@ -293,8 +292,6 @@
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR show_eng
RefreshAll
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile

View file

@ -197,7 +197,6 @@
EndIf
EndIf
@ -272,8 +271,6 @@
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR show_eng
RefreshAll
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile

View file

@ -197,7 +197,6 @@
EndIf
EndIf
@ -272,8 +271,6 @@
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR show_eng
RefreshAll
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile

View file

@ -201,7 +201,6 @@
EndIf
EndIf
@ -276,8 +275,6 @@
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR show_eng
RefreshAll
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile

View file

@ -206,7 +206,6 @@
EndIf
EndIf
@ -281,8 +280,6 @@
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR show_eng
RefreshAll
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile

View file

@ -197,7 +197,6 @@
EndIf
EndIf
@ -272,8 +271,6 @@
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR show_eng
RefreshAll
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile

View file

@ -1685,12 +1685,6 @@
<EventMachine>
;If MachineStage = "drink-success" Then
; Open "ROOT/taobin_project/xml/page_drinkok.xml"
;EndIf
;If MachineStage = "drink-failed" Then
; Open "ROOT/taobin_project/xml/page_drinkfail.xml"
;EndIf
If MachineStage = "drink-success" Then
Var MachineState_Result = 1

View file

@ -627,7 +627,7 @@
<Size> 20 </Size>
<Width> 280</Width>
<Align> Center </Align>
<Font> RobotoBlack </Font>
<Font> KanitLightTTF </Font>
<Color> 0x513C2F </Color>
<Value> nextCount </Value>
</Text>
@ -638,7 +638,7 @@
<Size> 20 </Size>
<Width> 280</Width>
<Align> Center </Align>
<Font> RobotoBlack </Font>
<Font> KanitLightTTF </Font>
<Color> 0x513C2F </Color>
<Value> next_name </Value>
</Text>

View file

@ -371,7 +371,11 @@
If stop_now = "true" Then
SAVELOG "stop_now is true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
If Seeker = "curr" Then
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
EndIf
EndIf
If Seeker = "curr" Then