Merge branch 'multiAds' into masterpiece

This commit is contained in:
Pakin 2024-02-27 09:17:12 +07:00
commit 867a006298
80 changed files with 12042 additions and 12073 deletions

View file

@ -528,28 +528,28 @@
If EnableLiveness = "true" Then
DEBUGVAR EnableLiveness
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
; full
Open "ROOT/taobin_project/xml/page_identity_verification.xml"
Else
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/advert.xml"
; Only IDCard
Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
EndIf
Else
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
Else
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
EndIf
Else
If DoorCupPosition = "bottom" Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
EndIf
@ -579,7 +579,7 @@
EndIf
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Else
@ -869,15 +869,15 @@
</Button>
;<Video>
;<X> 0 </X>
;<Y> 0 </Y>
;<Width> 1080</Width>
;<Height> 380 </Height>
;<Loop> "true" </Loop>
;<Filename> video_menu_0 </Filename>
;
;</Video>
; back
@ -2285,11 +2285,11 @@
DEBUGVAR RestrictedDrink
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_identity_verification.xml"
Else
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
@ -7838,4 +7838,4 @@
</EventUnitTest4>
</Popup>
</Popup>