Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

This commit is contained in:
pichet 2022-10-27 14:03:17 +07:00
commit 21340bc242
214 changed files with 6539 additions and 24444 deletions

View file

@ -122,6 +122,9 @@
If NeedUpgrade = "true" Then
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
Var TestLoopMakeDrink = 0
@ -177,24 +180,54 @@
DEBUGVAR AppFastEnable
DEBUGVAR MenuKidEnable
DEBUGVAR TaobinOnline
DEBUGVAR TermTemOnline
;DEBUGVAR TermTemOnline
DEBUGVAR WheyEnable
; Dtac.
DEBUGVAR ShowDtac1
Var CAMPAIGN1 = "false"
If TaobinOnlineX = "true" Then
Var EventTurnOn = 0
Var CountDownShowButton = 35
Var ShowButtonClickFull = "Invisible"
Var VideoMainPage = "ROOT/taobin_project/video/main_page.mp4"
DEBUGVAR SystemDateMonth
DEBUGVAR SystemDateDay
If SystemDateMonth = 10 Then
Var EventTurnOn = 1
EndIf
DEBUGVAR EventTurnOn
If SystemDateMonth = 11 Then
If SystemDateDay > 0 Then
If SystemDateDay < 10 Then
Var EventTurnOn = 2
EndIf
EndIf
EndIf
If EventTurnOn = 1 Then
Var ShowButtonClickFull = "Invisible"
Var CountDownShowButton = 0
Var VideoMainPage = "ROOT/taobin_project/video/main_page_event.mp4"
EndIf
If EventTurnOn = 2 Then
Var ShowButtonClickFull = "Invisible"
Var CountDownShowButton = 0
Var VideoMainPage = "ROOT/taobin_project/video/main_page_event_alter.mp4"
EndIf
;Var ShowButtonClickFull = "Invisible"
;Var CountDownShowButton = 0
;Var VideoMainPage = "ROOT/taobin_project/video/main_page_event.mp4"
EndIf
If TermTemOnline = "true" Then
Var CountDownShowButton = 28
@ -669,11 +702,9 @@
Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
If new_layout = "true" Then
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.xml"
Else
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_choose_drink1.xml"
EndIf
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.xml"
Machine DoorClose
TopView "show"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"