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

This commit is contained in:
wanlop run 2024-10-02 20:09:56 +07:00
commit e8148c2786
834 changed files with 34929 additions and 12935 deletions

View file

@ -925,11 +925,10 @@
DEBUGVAR ShowButtonClick2
Var UsePepsiTheme = 0
Var UsePepsiTheme = 1
Var TargetThemeNum = 2
;Var VideoAdvert = "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
; Var = "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
@ -995,6 +994,9 @@
Var MinPhoneNumber = 9
Var MaxPhoneNumber = 9
Var UsePepsiTheme = 1
Var TargetThemeNum = 2
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
EndIf
@ -1256,9 +1258,15 @@
Var MainStartPepsiThemeDir = MainStartPepsiThemeDir + "/image/main_page/"
;Var img_rest_main_page = MainStartPepsiThemeDir + "bn_main_page_start.png"
Var img_press_main_page = MainStartPepsiThemeDir + "bp_main_page_start.png"
Var img_press_main_page = ""
Var VideoMainPage = "ROOT/taobin_project/inter/whatthecup/common/video/video_main_wtc.mp4"
Var ShowButtonClickFull = "Enable"
; root-path
Var CountryWTCRootPath = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
EndIf
Else
; default-theme
@ -1580,6 +1588,11 @@ PRICE "Reset" "-"
If CountDownShowButton = 31 Then
Var ShowButtonClickFull = "Enable"
Var ShowButtonClick = "Invisible"
If UsePepsiTheme = 1 Then
Var ShowButtonClickFull = "Enable"
EndIf
Refresh
EndIf
@ -1587,6 +1600,11 @@ PRICE "Reset" "-"
Var ShowButtonClick = "Enable"
Var ShowButtonClickFull = "Invisible"
If UsePepsiTheme = 1 Then
Var ShowButtonClickFull = "Enable"
EndIf
Refresh
EndIf
@ -1618,7 +1636,6 @@ PRICE "Reset" "-"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
Var OpenFromPageBoard = 1