Remove oreo promotion
This commit is contained in:
parent
89cedc2d88
commit
be969ad22d
19 changed files with 46 additions and 99 deletions
|
|
@ -179,16 +179,13 @@
|
|||
<EventClick>
|
||||
SAVELOG "Click rec"
|
||||
Var NextPage = "-"
|
||||
If ShowPromoitonOreo = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
|
||||
Else
|
||||
|
||||
|
||||
; zone promote
|
||||
If SongkranEnable = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -701,10 +701,11 @@
|
|||
DEBUGVAR SoundThaiIndex
|
||||
|
||||
|
||||
Var CountDownCheckCamera = 0
|
||||
Var CountDownCheckCamera = 2
|
||||
|
||||
DEBUGVAR EnableLiveness
|
||||
DEBUGVAR LivenessControlVersion
|
||||
DEBUGVAR Not#CameraSettingStatus
|
||||
|
||||
RootLayoutVisible 3 "hide"
|
||||
</EventOpen>
|
||||
|
|
@ -824,23 +825,13 @@
|
|||
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
|
||||
|
||||
If $12-03-03-0009.Button = "Enable" Then
|
||||
|
||||
Else
|
||||
Var PromotionOreoVolcanoEnable = 0
|
||||
EndIf
|
||||
|
||||
|
||||
If ShowPromoitonOreo = 1 Then
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend2.xml"
|
||||
Else
|
||||
If SongkranEnable = 1 Then
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend3.xml"
|
||||
Else
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If SongkranEnable = 1 Then
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend3.xml"
|
||||
Else
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
EndIf
|
||||
|
||||
Machine DoorClose
|
||||
|
||||
TopView "show"
|
||||
|
|
@ -897,12 +888,17 @@
|
|||
;DEBUGVAR CountDownCheckCamera
|
||||
;DEBUGVAR Not#CameraSettingStatus
|
||||
If CountDownCheckCamera = 0 Then
|
||||
Var CountDownCheckCamera = 5
|
||||
|
||||
If Not#CameraSettingStatus = "" Then
|
||||
If CameraCount = 1 Then
|
||||
|
||||
Var CountDownCheckCamera = 2
|
||||
CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=0.7"
|
||||
Else
|
||||
Var CountDownCheckCamera = 5
|
||||
EndIf
|
||||
Else
|
||||
Var CountDownCheckCamera = 20
|
||||
EndIf
|
||||
Else
|
||||
Var CountDownCheckCamera = CountDownCheckCamera - 1
|
||||
|
|
|
|||
|
|
@ -337,7 +337,7 @@
|
|||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
|
||||
|
||||
; eng
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
|
|
|||
|
|
@ -203,11 +203,6 @@
|
|||
RebootWithCause "BoxID was zero"
|
||||
EndIf
|
||||
|
||||
If $12-03-03-0009.Button = "Enable" Then
|
||||
|
||||
Else
|
||||
Var PromotionOreoVolcanoEnable = 0
|
||||
EndIf
|
||||
|
||||
|
||||
Var Price5Active = 0
|
||||
|
|
@ -351,15 +346,15 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
|
||||
If ShowPromoitonOreo = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
|
||||
Else
|
||||
|
||||
|
||||
; zone promote
|
||||
|
||||
If SongkranEnable = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -327,16 +327,13 @@
|
|||
<EventClick>
|
||||
SAVELOG "Click rec"
|
||||
Var NextPage = "-"
|
||||
If ShowPromoitonOreo = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
|
||||
Else
|
||||
|
||||
|
||||
; zone promote
|
||||
If SongkranEnable = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -319,16 +319,13 @@
|
|||
<EventClick>
|
||||
SAVELOG "Click rec"
|
||||
Var NextPage = "-"
|
||||
If ShowPromoitonOreo = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
|
||||
Else
|
||||
|
||||
|
||||
If SongkranEnable = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -319,16 +319,13 @@
|
|||
<EventClick>
|
||||
SAVELOG "Click rec"
|
||||
Var NextPage = "-"
|
||||
If ShowPromoitonOreo = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
|
||||
Else
|
||||
|
||||
|
||||
; zone promote
|
||||
If SongkranEnable = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -328,16 +328,13 @@
|
|||
<EventClick>
|
||||
SAVELOG "Click rec"
|
||||
Var NextPage = "-"
|
||||
If ShowPromoitonOreo = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
|
||||
Else
|
||||
|
||||
|
||||
If SongkranEnable = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -319,16 +319,13 @@
|
|||
<EventClick>
|
||||
SAVELOG "Click rec"
|
||||
Var NextPage = "-"
|
||||
If ShowPromoitonOreo = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
|
||||
Else
|
||||
|
||||
|
||||
If SongkranEnable = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -317,16 +317,13 @@
|
|||
<EventClick>
|
||||
SAVELOG "Click rec"
|
||||
Var NextPage = "-"
|
||||
If ShowPromoitonOreo = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
|
||||
Else
|
||||
|
||||
|
||||
; zone promote
|
||||
If SongkranEnable = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -315,16 +315,13 @@
|
|||
<EventClick>
|
||||
SAVELOG "Click rec"
|
||||
Var NextPage = "-"
|
||||
If ShowPromoitonOreo = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
|
||||
Else
|
||||
|
||||
|
||||
; zone promote
|
||||
If SongkranEnable = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -318,16 +318,13 @@
|
|||
<EventClick>
|
||||
SAVELOG "Click rec"
|
||||
Var NextPage = "-"
|
||||
If ShowPromoitonOreo = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
|
||||
Else
|
||||
|
||||
|
||||
; zone promote
|
||||
If SongkranEnable = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -336,16 +336,13 @@
|
|||
<EventClick>
|
||||
SAVELOG "Click rec"
|
||||
Var NextPage = "-"
|
||||
If ShowPromoitonOreo = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
|
||||
Else
|
||||
|
||||
|
||||
; zone promote
|
||||
If SongkranEnable = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -336,16 +336,13 @@
|
|||
<EventClick>
|
||||
SAVELOG "Click rec"
|
||||
Var NextPage = "-"
|
||||
If ShowPromoitonOreo = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
|
||||
Else
|
||||
|
||||
|
||||
If SongkranEnable = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -315,16 +315,13 @@
|
|||
<EventClick>
|
||||
SAVELOG "Click rec"
|
||||
Var NextPage = "-"
|
||||
If ShowPromoitonOreo = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
|
||||
Else
|
||||
|
||||
|
||||
If SongkranEnable = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -319,16 +319,13 @@
|
|||
<EventClick>
|
||||
SAVELOG "Click rec"
|
||||
Var NextPage = "-"
|
||||
If ShowPromoitonOreo = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
|
||||
Else
|
||||
|
||||
|
||||
; zone promote
|
||||
If SongkranEnable = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -324,16 +324,13 @@
|
|||
<EventClick>
|
||||
SAVELOG "Click rec"
|
||||
Var NextPage = "-"
|
||||
If ShowPromoitonOreo = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
|
||||
Else
|
||||
|
||||
|
||||
; zone promote
|
||||
If SongkranEnable = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -291,16 +291,13 @@
|
|||
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
|
||||
; eng
|
||||
If ShowPromoitonOreo = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
|
||||
Else
|
||||
|
||||
|
||||
; zone promote
|
||||
If SongkranEnable = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
|
|||
|
|
@ -363,6 +363,7 @@
|
|||
|
||||
<EventLivenessState>
|
||||
DEBUGVAR LivenessStateString
|
||||
DEBUGVAR LivenessStateForPlaySound
|
||||
|
||||
If LivenessResult = "pass" Then
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue