pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
Pakin 2024-08-29 13:20:32 +07:00
commit 0f60d3b677
1 changed files with 4 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

59
inter/aus/xml/page_show_error.lxml
View file

@ -32,25 +32,16 @@
DEBUGVAR MachineStage DEBUGVAR MachineStage
DEBUGVAR stop_now DEBUGVAR stop_now
Var DirImage = "ROOT/taobin_project/inter/aus/image/vending_error_en" Var DirImage = "ROOT/taobin_project/inter/aus/image/vending_error_en"
If MachineStage = "mcu-upgrade" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If NeedUpgrade = "true" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
DEBUGVAR MachineStage DEBUGVAR MachineStage
If MachineStage = "close-maintenance" Then If MachineStage = "close-maintenance" Then
DEBUGVAR stop_now DEBUGVAR stop_now
If stop_now = "true" Then If stop_now = "true" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
Else Else
Var show_error_normal = "Enable" Var show_error_normal = "Enable"
Var show_error_sp1 = "Invisible" Var show_error_sp1 = "Invisible"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
EndIf EndIf
@ -58,23 +49,16 @@
If MachineStage = "drink-failed" Then If MachineStage = "drink-failed" Then
If stop_now = "true" Then If stop_now = "true" Then
Var DirImage = CountryRootPath + "image/vending_error_en"
Else Else
Var show_error_normal = "Enable" Var show_error_normal = "Enable"
Var show_error_sp1 = "Invisible" Var show_error_sp1 = "Invisible"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
EndIf EndIf
If NETCORE_LOST_CNT > 0 Then
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If NETCORE_EVENT_CNT_X >= 30 Then If NETCORE_EVENT_CNT_X >= 30 Then
Var NETCORE_EVENT_CNT_X = 0 Var NETCORE_EVENT_CNT_X = 0
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
Var MaintenanceCard = 20 Var MaintenanceCard = 20
@ -96,6 +80,8 @@
Var textStep = 0 Var textStep = 0
RootLayoutVisible 3 "show" RootLayoutVisible 3 "show"
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
@ -238,22 +224,6 @@
;Open "ROOT/taobin_project/inter/aus/xml/page_show_error.lxml" ;Open "ROOT/taobin_project/inter/aus/xml/page_show_error.lxml"
</EventTimeout> </EventTimeout>
<EventLanguageOnChange>
DEBUGVAR LanguageShow
Var LanguageButtonEnable = "Enable"
Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 648
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 640
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
Open "ROOT/taobin_project/inter/aus/xml/page_show_error.lxml"
Refresh
</EventLanguageOnChange>
<Image> <Image>
<State> show_error_normal </State> <State> show_error_normal </State>
<X> 69 </X> <X> 69 </X>
@ -268,27 +238,6 @@
<Filename> Var(DirImage + "/img_error_aus.png") </Filename> <Filename> Var(DirImage + "/img_error_aus.png") </Filename>
</Image> </Image>
;<Image>
;<State> show_error_sp1 </State>
;<X> 0 </X>
;<Y> 897 </Y>
;<Filename> Var(DirImage + "/img1.png") </Filename>
;</Image>
;
;<Image>
;<State> show_error_sp1 </State>
;<X> 0 </X>
;<Y> 694 </Y>
;<Filename> Var(DirImage + "/text1.png") </Filename>
;</Image>
;
;<Image>
;<State> show_error_sp1 </State>
;<X> 127 </X>
;<Y> 1685 </Y>
;<Filename> Var(DirImage + "/text2.png") </Filename>
;</Image>
<Button> <Button>
<X> 0 </X> <X> 0 </X>
<Y> 1860 </Y> <Y> 1860 </Y>