pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Remove oreo promotion

Browse source
This commit is contained in:
kong 2023-04-21 11:04:06 +07:00
parent 89cedc2d88
commit be969ad22d
19 changed files with 46 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

7
xml/menu_catalog_new.xml
View file

@ -179,16 +179,13 @@
<EventClick> <EventClick>
SAVELOG "Click rec" SAVELOG "Click rec"
Var NextPage = "-" Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" ; zone promote
Else
If SongkranEnable = 1 Then If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>

34
xml/page_board.xml
View file

@ -701,10 +701,11 @@
DEBUGVAR SoundThaiIndex DEBUGVAR SoundThaiIndex
Var CountDownCheckCamera = 0 Var CountDownCheckCamera = 2
DEBUGVAR EnableLiveness DEBUGVAR EnableLiveness
DEBUGVAR LivenessControlVersion DEBUGVAR LivenessControlVersion
DEBUGVAR Not#CameraSettingStatus
RootLayoutVisible 3 "hide" RootLayoutVisible 3 "hide"
</EventOpen> </EventOpen>
@ -824,23 +825,13 @@
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
If $12-03-03-0009.Button = "Enable" Then
If SongkranEnable = 1 Then
Else OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend3.xml"
Var PromotionOreoVolcanoEnable = 0 Else
EndIf OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.xml"
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
Machine DoorClose Machine DoorClose
TopView "show" TopView "show"
@ -897,12 +888,17 @@
;DEBUGVAR CountDownCheckCamera ;DEBUGVAR CountDownCheckCamera
;DEBUGVAR Not#CameraSettingStatus ;DEBUGVAR Not#CameraSettingStatus
If CountDownCheckCamera = 0 Then If CountDownCheckCamera = 0 Then
Var CountDownCheckCamera = 5
If Not#CameraSettingStatus = "" Then If Not#CameraSettingStatus = "" Then
If CameraCount = 1 Then If CameraCount = 1 Then
Var CountDownCheckCamera = 2
CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=0.7" CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=0.7"
Else
Var CountDownCheckCamera = 5
EndIf EndIf
Else
Var CountDownCheckCamera = 20
EndIf EndIf
Else Else
Var CountDownCheckCamera = CountDownCheckCamera - 1 Var CountDownCheckCamera = CountDownCheckCamera - 1

2
xml/page_catalog.xml
View file

@ -337,7 +337,7 @@
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
; eng ; eng
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
</EventClick> </EventClick>
</Button> </Button>

13
xml/page_catalog2.xml
View file

@ -203,11 +203,6 @@
RebootWithCause "BoxID was zero" RebootWithCause "BoxID was zero"
EndIf EndIf
If $12-03-03-0009.Button = "Enable" Then
Else
Var PromotionOreoVolcanoEnable = 0
EndIf
Var Price5Active = 0 Var Price5Active = 0
@ -351,15 +346,15 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" 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 If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>

7
xml/page_catalog_group_appfast.xml
View file

@ -327,16 +327,13 @@
<EventClick> <EventClick>
SAVELOG "Click rec" SAVELOG "Click rec"
Var NextPage = "-" Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" ; zone promote
Else
If SongkranEnable = 1 Then If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>

5
xml/page_catalog_group_cocktail.xml
View file

@ -319,16 +319,13 @@
<EventClick> <EventClick>
SAVELOG "Click rec" SAVELOG "Click rec"
Var NextPage = "-" Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
If SongkranEnable = 1 Then If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>

7
xml/page_catalog_group_coffee.xml
View file

@ -319,16 +319,13 @@
<EventClick> <EventClick>
SAVELOG "Click rec" SAVELOG "Click rec"
Var NextPage = "-" Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" ; zone promote
Else
If SongkranEnable = 1 Then If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>

5
xml/page_catalog_group_forkid.xml
View file

@ -328,16 +328,13 @@
<EventClick> <EventClick>
SAVELOG "Click rec" SAVELOG "Click rec"
Var NextPage = "-" Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
If SongkranEnable = 1 Then If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>

5
xml/page_catalog_group_health.xml
View file

@ -319,16 +319,13 @@
<EventClick> <EventClick>
SAVELOG "Click rec" SAVELOG "Click rec"
Var NextPage = "-" Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
If SongkranEnable = 1 Then If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>

7
xml/page_catalog_group_milk.xml
View file

@ -317,16 +317,13 @@
<EventClick> <EventClick>
SAVELOG "Click rec" SAVELOG "Click rec"
Var NextPage = "-" Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" ; zone promote
Else
If SongkranEnable = 1 Then If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>

7
xml/page_catalog_group_oreo.xml
View file

@ -315,16 +315,13 @@
<EventClick> <EventClick>
SAVELOG "Click rec" SAVELOG "Click rec"
Var NextPage = "-" Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" ; zone promote
Else
If SongkranEnable = 1 Then If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>

7
xml/page_catalog_group_other.xml
View file

@ -318,16 +318,13 @@
<EventClick> <EventClick>
SAVELOG "Click rec" SAVELOG "Click rec"
Var NextPage = "-" Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" ; zone promote
Else
If SongkranEnable = 1 Then If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>

7
xml/page_catalog_group_recommend.xml
View file

@ -336,16 +336,13 @@
<EventClick> <EventClick>
SAVELOG "Click rec" SAVELOG "Click rec"
Var NextPage = "-" Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" ; zone promote
Else
If SongkranEnable = 1 Then If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>

5
xml/page_catalog_group_recommend3.xml
View file

@ -336,16 +336,13 @@
<EventClick> <EventClick>
SAVELOG "Click rec" SAVELOG "Click rec"
Var NextPage = "-" Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
If SongkranEnable = 1 Then If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>

5
xml/page_catalog_group_songkran.xml
View file

@ -315,16 +315,13 @@
<EventClick> <EventClick>
SAVELOG "Click rec" SAVELOG "Click rec"
Var NextPage = "-" Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
If SongkranEnable = 1 Then If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>

7
xml/page_catalog_group_tea.xml
View file

@ -319,16 +319,13 @@
<EventClick> <EventClick>
SAVELOG "Click rec" SAVELOG "Click rec"
Var NextPage = "-" Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" ; zone promote
Else
If SongkranEnable = 1 Then If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>

7
xml/page_catalog_group_whey.xml
View file

@ -324,16 +324,13 @@
<EventClick> <EventClick>
SAVELOG "Click rec" SAVELOG "Click rec"
Var NextPage = "-" Var NextPage = "-"
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" ; zone promote
Else
If SongkranEnable = 1 Then If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>

7
xml/page_catalog_with_vending.xml
View file

@ -291,16 +291,13 @@
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
; eng ; eng
If ShowPromoitonOreo = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" ; zone promote
Else
If SongkranEnable = 1 Then If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>

1
xml/page_identity_verification.xml
View file

@ -363,6 +363,7 @@
<EventLivenessState> <EventLivenessState>
DEBUGVAR LivenessStateString DEBUGVAR LivenessStateString
DEBUGVAR LivenessStateForPlaySound
If LivenessResult = "pass" Then If LivenessResult = "pass" Then