Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
c72eba6b87
214 changed files with 32239 additions and 1842 deletions
|
|
@ -7,12 +7,12 @@
|
|||
<Height> 600 </Height>
|
||||
<Background> "/ROOT/pictures/startup.bmp" </Background>
|
||||
<Timeout> 3000 </Timeout>
|
||||
<EventTimeout>
|
||||
<EventTimeout>
|
||||
|
||||
CameraService "filter-remove-all"
|
||||
CameraService "add-filter=mClass=9,mSubclass=4"
|
||||
CameraService "add-filter=USB Camera"
|
||||
|
||||
|
||||
CameraService "Start"
|
||||
|
||||
Var NeedReboot = "false"
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
FlushTxRef1
|
||||
EndIf
|
||||
|
||||
Open "/ROOT/xml/main.xml"
|
||||
Open "/ROOT/xml/main.xml"
|
||||
</EventTimeout>
|
||||
<EventOpen>
|
||||
Var video_main_0 = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_00.mp4"
|
||||
|
|
@ -66,14 +66,14 @@
|
|||
Var AdvertiseProfile16 = "00"
|
||||
Var AdvertiseProfile17 = "00"
|
||||
Var AdvertiseProfile18 = "00"
|
||||
|
||||
|
||||
Var ExtSlot1 = ""
|
||||
Var ExtSlot2 = ""
|
||||
Var ExtSlot3 = ""
|
||||
Var ExtSlot4 = ""
|
||||
Var ExtSlot5 = ""
|
||||
Var ExtSlot6 = ""
|
||||
|
||||
|
||||
Var AdvExt1 = ".mp4"
|
||||
Var AdvExt2 = ".mp4"
|
||||
Var AdvExt3 = ".mp4"
|
||||
|
|
@ -95,7 +95,7 @@
|
|||
Var AdvExt19 = ".mp4"
|
||||
Var AdvExt20 = ".bmp"
|
||||
|
||||
;Dtac
|
||||
;Dtac
|
||||
Var RandomPromotion = 0
|
||||
;true_move
|
||||
Var RandomPromotion1 = 0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue