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

SGP: WIP change theme

Browse source
This commit is contained in:
Pakin 2024-08-13 14:43:45 +07:00
parent 9aefaf7220
commit 371794d944
11 changed files with 2034 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

38
inter/sgp/xml/page_brewing3.lxml
View file

@ -2,9 +2,14 @@
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Background> BackgroundColor </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
If UsePepsiTheme = 1 Then
Open "ROOT/taobin_project/inter/sgp/xml/page_brewing3_blue.lxml"
EndIf
Var SendNotiPaySuccess = 2
Var GetMoreStrawCount = 2
@ -27,6 +32,12 @@
Var DirImageDoing = CountryRootPath + "/image/page_doing"
If UsePepsiTheme = 1 Then
Var DirImageDoing = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing"
EndIf
DEBUGVAR BackgroundColor
Var SelectDrink = Seeker.selected_a_drink
Var ExtendData = Seeker.ExtendData
@ -56,7 +67,6 @@
Var IMG_CNT = DirImageDoing + "/img2_eng.png"
Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3"
Var bnGetMoreStrawFileName = DirImageDoing + "/bn_get_more_straw_en.png"
Var bpGetMoreStrawFileName = DirImageDoing + "/bp_get_more_straw_en.png"
@ -73,6 +83,19 @@
Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3_en.png"
Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1_en.png"
DEBUGVAR bnGetMoreStrawFileName
DEBUGVAR bnStrawProblemReport
DEBUGVAR bnLidProblemReport
DEBUGVAR bn_get_lid_image
;If UsePepsiTheme = 1 Then
; Var brew_txt2 = "ROOT/taobin_project/inter/whatthecup/sgp/video/brewing_txt_adv3_en.png"
; Var brew_txt1 = "ROOT/taobin_project/inter/whatthecup/sgp/video/brewing_txt_adv1_en.png"
;EndIf
DEBUGVAR EnableGetMoreStrawFileName
DEBUGVAR GetLidButtonState
Var XStraw = 274
Else
Var PlaySoundLag = "ROOT/taobin_project/sound_thai/thankyou.mp3"
@ -232,6 +255,11 @@
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
If UsePepsiTheme = 1 Then
Var DirImage = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment_en/page_payment"
Var DirImage2 = "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en"
EndIf
Else
Var DirImage = "ROOT/taobin_project/image/page_payment"
Var DirImage2 = "ROOT/taobin_project/image/topping2"
@ -436,6 +464,10 @@
Var ShowCountdown = "Invisible"
Var IMG_CNT = "ROOT/taobin_project/inter/sgp/image/page_doing/img2_percent_eng.png"
If UsePepsiTheme = 1 Then
Var IMG_CNT = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing/img2_percent_eng.png"
EndIf
EndIf
If XPercent = 0 Then
@ -1585,7 +1617,7 @@
<Width> 153 </Width>
<Size> 88 </Size>
<Font> RobotoBold </Font>
<Color> 0x513C2F </Color>
<Color> BodyTextColor </Color>
<Value> XPercent </Value>
</Text>

1952
inter/sgp/xml/page_brewing3_blue.lxml Normal file
View file

File diff suppressed because it is too large Load diff

2
inter/sgp/xml/page_collect_point_1.lxml
View file

@ -2,7 +2,7 @@
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Background> BackgroundColor </Background>
<Volume> SoundVolume </Volume>
;<Refresh> "Partial" </Refresh>
<EventOpen>

17
inter/sgp/xml/page_member_prompt.lxml
View file

@ -2,7 +2,7 @@
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Background> BackgroundColor </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
@ -22,12 +22,20 @@
; img
Var ImgDir = CountryRootPath + "/image/page_member/"
Var ImgDirStatic = CountryRootPath + "/image/page_member/"
If UsePepsiTheme = 1 Then
Var ImgDir = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
Var ImgDir = ImgDir + "/image/page_member/"
EndIf
Var PromptDialogImg = ImgDir + "ask_member_dialog.png"
Var YesButton = ImgDir + "bn_yes.png"
Var NoButton = ImgDir + "bn_no.png"
Var YesPressButton = ImgDir + "bp_yes.png"
Var NoPressButton = ImgDir + "bp_no.png"
Var QRImg = ImgDir + "qr_regis.png"
Var QRImg = ImgDirStatic + "qr_regis.png"
Var UseSGPCollectFlag = 0
@ -35,6 +43,7 @@
DEBUGVAR ChangeFlag2
Var IMG_CNT = ImgDir + "img2_sp_eng.png"
DEBUGVAR IMG_CNT
</EventOpen>
@ -123,7 +132,7 @@
<Width> 153 </Width>
<Size> 88 </Size>
<Font> RobotoBold </Font>
<Color> 0x513C2F </Color>
<Color> HeadlineColor </Color>
<Value> RemainingInThisPage </Value>
</Text>
@ -136,7 +145,7 @@
<Width> 1080 </Width>
<Font> KanitRegularTTF </Font>
<State> DisplayQR </State>
<Color> 0xDE794E </Color>
<Color> HeadlineColor </Color>
<Value> "Please scan QR to register" </Value>
</Text>

1
inter/whatthecup/color_settings.ev → inter/whatthecup/common/color_settings.ev
View file

@ -68,6 +68,7 @@ If TargetThemeNum = 2 Then
Var HeadlineColor = HeadlineColor2
Var SubHeadlineColor = BodyTextColor2
Var PopupBodyTextColor = WTCSemiMediumBlueColor
Var BodyTextColor = BodyTextColor2
EndIf
If TargetThemeNum = 3 Then

0
inter/whatthecup/sgp/image/collectiing_en/img2_sp_eng.png → inter/whatthecup/sgp/image/page_member/img2_sp_eng.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Before After
Before After

7
xml/default_color_settings.ev Normal file
View file

@ -0,0 +1,7 @@
Var WelcomeColor = "0xEE8C62"
Var BackgroundColor = "0xeae6e1"
Var HeadlineColor = "0x513C2F"
Var SubHeadlineColor = "0x6F5F51"
Var PopupBodyTextColor = "0xB78F24"

6
xml/page_board.xml
View file

@ -1207,7 +1207,7 @@
If UsePepsiTheme = 1 Then
If InternationalEnable = 1 Then
; enable-color
TRY "ROOT/taobin_project/inter/whatthecup/color_settings.ev"
TRY "ROOT/taobin_project/inter/whatthecup/common/color_settings.ev"
Var MainStartPepsiThemeDir = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
Var MainStartPepsiThemeDir = MainStartPepsiThemeDir + "/image/main_page/"
@ -1215,11 +1215,11 @@
;Var img_rest_main_page = MainStartPepsiThemeDir + "bn_main_page_start.png"
Var img_press_main_page = MainStartPepsiThemeDir + "bp_main_page_start.png"
Var VideoMainPage = "ROOT/taobin_project/inter/sgp/video/video_main_wtc.mp4"
Var VideoMainPage = "ROOT/taobin_project/inter/whatthecup/common/video/video_main_wtc.mp4"
EndIf
Else
; default-theme
TRY "ROOT/taobin_project/inter/whatthecup/default_color_settings.ev"
TRY "ROOT/taobin_project/xml/default_color_settings.ev"
EndIf
XMLSaveFileNameForResume 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml"

11
xml/page_drinkok.xml
View file

@ -2,7 +2,7 @@
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Background> BackgroundColor </Background>
<Volume> SoundVolume </Volume>
<Sound> "ROOT/sounds/Ding-dong.wav" </Sound>
<EventOpen>
@ -71,6 +71,13 @@
Var text_bottom = DirImage + "text_bottom.png"
EndIf
If UsePepsiTheme = 1 Then
Var text_bottom = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
Var text_bottom = text_bottom + "/image/complete_en/text_bottom.png"
EndIf
DEBUGVAR text_bottom
Var VideoPlayFile = VideoPath
@ -577,7 +584,7 @@
<Align> Center </Align>
<Font> KanitLightTTF </Font>
<Size> 48 </Size>
<Color> 0x513C2F </Color>
<Color> HeadlineColor </Color>
<Value>
eval(
STRCONTAIN "size" Seeker.showname SizeFromSheet

12
xml/page_lid_straw.xml
View file

@ -72,6 +72,18 @@
EndIf
If UsePepsiTheme = 1 Then
Var VideoPath = CountryRootPath + "/animation01/"
Var VideoFileBegin = "TaoBin2_draft02_art"
Var VideoFileEnd = ".mp4"
Var PicturePath = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
Var PicturePath = PicturePath + "/image/page_doing/"
Var PictureBegin = "txt_"
Var PictureEnd = "_en.png"
EndIf
Else
Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/"
Var VideoFileBegin = "TaoBin2_draft02_art"

2
xml/page_thankyou.xml
View file

@ -2,7 +2,7 @@
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Background> BackgroundColor </Background>
<Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound>
<Volume> SoundVolume </Volume>
<EventOpen>