Merge branch 'multiAds' into masterpiece
This commit is contained in:
commit
867a006298
80 changed files with 12042 additions and 12073 deletions
|
|
@ -323,7 +323,7 @@
|
|||
READ_FILE "/mnt/sdcard/coffeevending/sim_on" str_sim_on
|
||||
DEBUGVAR str_sim_on
|
||||
If str_sim_on = "1" Then
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
|
||||
|
||||
|
|
@ -348,7 +348,7 @@
|
|||
EndIf
|
||||
|
||||
If CountTouchButton = 7 Then
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue