merged
This commit is contained in:
commit
36ceee08bc
160 changed files with 5829 additions and 360 deletions
|
|
@ -107,12 +107,15 @@
|
|||
|
||||
StopLongPlay
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
Var TimerFirst = "true"
|
||||
|
||||
; TODO: remove when release
|
||||
;Var IgnoreNetCore = "true"
|
||||
|
||||
=======
|
||||
>>>>>>> 546c45f9efeb4082632779505569a6c9da59fbde
|
||||
</EventOpen>
|
||||
|
||||
<Timeout> 1000 </Timeout>
|
||||
|
|
@ -222,6 +225,7 @@
|
|||
Open CurrentXMLFileName0
|
||||
TouchTapClose
|
||||
Refresh
|
||||
|
||||
</EventEnd>
|
||||
|
||||
|
||||
|
|
@ -239,7 +243,11 @@
|
|||
<Video>
|
||||
<X> 0 </X>
|
||||
<Y> 0 </Y>
|
||||
<<<<<<< HEAD
|
||||
;<Loop>"true"</Loop>
|
||||
=======
|
||||
<Loop>"true"</Loop>
|
||||
>>>>>>> 546c45f9efeb4082632779505569a6c9da59fbde
|
||||
;<Volume> 80 </Volume>
|
||||
<Filename> "ROOT/taobin_project/video/main_page.mp4" </Filename>
|
||||
</Video>
|
||||
|
|
@ -301,7 +309,11 @@
|
|||
<EventClick>
|
||||
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
<<<<<<< HEAD
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_memeber.xml"
|
||||
=======
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_member.xml"
|
||||
>>>>>>> 546c45f9efeb4082632779505569a6c9da59fbde
|
||||
|
||||
TopView "show"
|
||||
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue