Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
17d538ceb1
63 changed files with 81015 additions and 881 deletions
|
|
@ -212,6 +212,7 @@
|
|||
Var AppFastButtonState = "Invisible"
|
||||
Var WheyButtonState = "Enable"
|
||||
Var MenuKidButtonState ="Invisible"
|
||||
Var MenuKidEnable = "false"
|
||||
Else
|
||||
Var MenuKidEnable = "true"
|
||||
Var AppFastButtonState = "Invisible"
|
||||
|
|
@ -233,10 +234,10 @@
|
|||
|
||||
Var TaobinOnlineX = "true"
|
||||
|
||||
DEBUGVAR AppFastEnable
|
||||
DEBUGVAR MenuKidEnable
|
||||
DEBUGVAR AppFastButtonState
|
||||
DEBUGVAR MenuKidButtonState
|
||||
DEBUGVAR TaobinOnline
|
||||
;DEBUGVAR TermTemOnline
|
||||
DEBUGVAR WheyButtonState
|
||||
DEBUGVAR WheyEnable
|
||||
|
||||
; Dtac.
|
||||
|
|
@ -1013,6 +1014,23 @@
|
|||
EndIf
|
||||
|
||||
Var SlientRefreshEnable = 0
|
||||
|
||||
If EnergyDrink1BathPro = 1 Then
|
||||
If CurrentMainVideo = 1 Then
|
||||
Var VideoMainPage = "ROOT/taobin_project/video/main_page_event_pro2.mp4"
|
||||
Var CurrentMainVideoTemp = 2
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If CoffeeDrink1BathPro = 1 Then
|
||||
If CurrentMainVideo = 1 Then
|
||||
Var VideoMainPage = "ROOT/taobin_project/video/main_page_event_pro3.mp4"
|
||||
Var CurrentMainVideoTemp = 2
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var CurrentMainVideo = CurrentMainVideoTemp
|
||||
|
||||
</EventOpen>
|
||||
|
||||
<EventUnitTest1>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue