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

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

Browse source
This commit is contained in:
pichet 2022-10-27 14:03:17 +07:00
commit 21340bc242
214 changed files with 6539 additions and 24444 deletions
Download patch file Download diff file Expand all files Collapse all files

32
xml/page_brewing3.xml
View file

@ -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"
@ -1075,6 +1082,14 @@
EndIf
EndIf
If GetMoreStrawCount <= 0 Then
If StrawProblemStatus = 1 Then
Var StrawProblemStatus = 2
Var bg_strawProblem_ST = "Enable"
EndIf
EndIf
Refresh
TimerReset
@ -1304,6 +1319,23 @@
</EventClick>
</Button>
<Button>
<X> XStraw </X>
<Y> 1787 </Y>
<State>bg_strawProblem_ST</State>
<Filename> bnStrawProblemReport </Filename>
<FilenamePress> bpStrawProblemReport </FilenamePress>
<EventClick>
Var strawStr = "แจ้งปัญหาไม่ได้รับหลอด"
__CMD "straw-alert" 0 strawStr "-"
__CMD "send-error-code" 1231 "-" "-"
Var bg_strawProblem_ST = "Invisible"
Refresh
</EventClick>
</Button>
<Button>