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

fix Conflict merge

Browse source
This commit is contained in:
miggaze 2021-11-10 15:46:37 +07:00
commit cea1107abf
60 changed files with 4728 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

3
xml/page_catalog.xml
View file

@ -18,7 +18,7 @@
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_tt_catalog.xml"
EndIf
Machine DoorLidClose
;Machine DoorLidClose
Var GetPayInfoFlag = 0
Var countDownRetrun = 30
@ -51,7 +51,6 @@
Var StrawAutoRelease1 = "false"
Var StrawAutoRelease2 = "false"
Machine DoorClose
If NetworkStatus = "ACTIVATE" Then
Var ShowButtonClick2 = "Enable"