Merge branch 'master' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project
This commit is contained in:
commit
9931cb7c1e
29 changed files with 7256 additions and 7237 deletions
|
|
@ -821,18 +821,21 @@
|
|||
If Not#LanguageResult = "false" Then
|
||||
LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/ui/lang.tsv"
|
||||
EndIf
|
||||
|
||||
Var RootPath = "ROOT/taobin_project/inter/common/"
|
||||
|
||||
Var OpenFileXML = CountryRootPath + "xml/event/tricker.ev"
|
||||
DEBUGVAR OpenFileXML
|
||||
TRY OpenFileXML
|
||||
|
||||
|
||||
Else
|
||||
Var LanguageObjectShow = "Invisible"
|
||||
Var NoLangObjectShow = "Enable"
|
||||
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
|
||||
|
||||
Var RootPath = "ROOT/taobin_project/"
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -1388,8 +1391,8 @@
|
|||
<State> buttonRemoveCup </State>
|
||||
;<Color> "0x00BDFF" </Color>
|
||||
<Interval> 500 </Interval>
|
||||
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
|
||||
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
|
||||
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
|
||||
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
|
||||
<EventClick>
|
||||
Machine RemoveCup
|
||||
Machine DoorLidOpen
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue