This commit is contained in:
kong 2023-02-14 17:09:30 +07:00
parent 1fa3f9b1cf
commit 623002c863
11 changed files with 104 additions and 111 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

View file

@ -588,7 +588,7 @@
EndIf
DEBUGVAR CountryName
DEBUGVAR LanguageShow
DEBUGVAR LanguageListEnable
DEBUGVAR DisplayFormat
DEBUGVAR ScaleValueForCalculation
DEBUGVAR PreScaleConvertShow
@ -757,38 +757,6 @@
EndIf
If TermTemOnline = "true" Then
If CountDownShowButton = 31 Then
Var ShowButtonClickFull = "Enable"
Var ShowButtonClick = "Invisible"
Refresh
EndIf
If CountDownShowButton = 3 Then
Var ShowButtonClick = "Enable"
Var ShowButtonClickFull = "Invisible"
Refresh
EndIf
If CountDownPauseVideo > 0 Then
; ignore
Var CountDownPauseVideo = CountDownPauseVideo - 1
If CountDownPauseVideo = 0 Then
Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/termtem_project/xml/page_tt__catalog_choose_drink1.xml"
TopView "show"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
EndIf
EndIf
EndIf
If TimerFirst = "true" Then
@ -915,6 +883,7 @@
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
If CocktailShow = "true" Then
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"

View file

@ -48,29 +48,7 @@
; Clear value
Topping "clear" "-"
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/page2_en/page2"
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3"
Play PlaySoundLag
Var DirImageCart = "ROOT/taobin_project/image/cart_en"
Var text_unavailable = "UNAVAILABLE###size=16"
Else
Var DirImage = "ROOT/taobin_project/image/page2"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"
Play PlaySoundLag
Var DirImageCart = "ROOT/taobin_project/image/cart_th"
Var text_unavailable = "หมด###size=32"
EndIf
Var DirImage = "ROOT/taobin_project/image/page2_inter/"
@ -328,6 +306,7 @@
</Image>
<EventLanguageOnChange>
DEBUGVAR LanguageShow
If LanguageShow = "ENG" Then
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3"
@ -338,6 +317,7 @@
EndIf
Play PlaySoundLag
Var countDownRetrun = 300
Refresh
</EventLanguageOnChange>

View file

@ -5,7 +5,7 @@
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
Var UserSeletedSugar = 0
@ -204,38 +204,31 @@
Var text_cold_color = "0x84776F"
Var text_blender_color = "0x84776F"
If new_layout = "true" Then
Var PriceDrinkTmpShow = "---"
Var PriceDrinkTmpShow = "---"
Var show_select_type = "Enable"
Var show_select_type = "Enable"
Var hot_button_state = PD_STAGE_1
Var cold_button_state = PD_STAGE_2
Var blend_button_state = PD_STAGE_3
Var hot_button_state = PD_STAGE_1
Var cold_button_state = PD_STAGE_2
Var blend_button_state = PD_STAGE_3
; Protect have product-code but menu disable or invalid.
If hot_button_state = "Invisible" Then
; Protect have product-code but menu disable or invalid.
If hot_button_state = "Invisible" Then
Var hot_button_state = "Disable2"
EndIf
If cold_button_state = "Invisible" Then
Var cold_button_state = "Disable2"
EndIf
If blend_button_state = "Invisible" Then
Var blend_button_state = "Disable2"
EndIf
Function 2
Else
Var show_select_type = "Invisible"
; assume auto select
Var SelectDrinkType = 1
Var hot_button_state = "Disable2"
EndIf
If cold_button_state = "Invisible" Then
Var cold_button_state = "Disable2"
EndIf
If blend_button_state = "Invisible" Then
Var blend_button_state = "Disable2"
EndIf
Function 2
DEBUGVAR show_select_type
DEBUGVAR PriceD1
@ -298,6 +291,8 @@
Var showname = aliasName[LanguageShowByIndex]
Var showdesc = aliasName[LanguageShowByIndex]
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -454,17 +449,20 @@
<EventLanguageOnChange>
DEBUGVAR LanguageShowByIndex
DEBUGVAR LanguageShow
If LanguageShow = "ENG" Then
Var topping_shot_price_x = 630
Var text_x_add_oreo_price = 510
Var text_show_normal_x = 408
Var text_show_blend_x = 872
Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
EndIf
If LanguageShow = "THAI" Then
Var topping_shot_price_x = 600
Var text_x_add_oreo_price = 490
Var text_show_normal_x = 386
Var text_show_blend_x = 852
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
EndIf
@ -475,6 +473,8 @@
Var showname = aliasName[LanguageShowByIndex]
Var showdesc = aliasName[LanguageShowByIndex]
EndIf
Var Timeout = 0
</EventLanguageOnChange>
@ -491,7 +491,7 @@
;Open PreviseXMLFileName2
DEBUGVAR OpenFromXML
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
Open OpenFromXML
@ -1373,6 +1373,8 @@
</Text>
<Button>
<X> 456 </X>
<Y> 72 </Y>
@ -1425,6 +1427,15 @@
</EventClick>
<Language>
<X> 43 </X>
<Y> 8 </Y>
<Width> 60 </Width>
<Height> 42 </Height>
<ID> 000081 </ID>
</Language>
</Button>
@ -1475,6 +1486,13 @@
Var IndexDrinktType = 1
</EventClick>
<Language>
<X> 40 </X>
<Y> 8 </Y>
<Width> 60 </Width>
<Height> 42 </Height>
<ID> 000082 </ID>
</Language>
</Button>
@ -1525,6 +1543,13 @@
Var IndexDrinktType = 2
</EventClick>
<Language>
<X> 26 </X>
<Y> 8 </Y>
<Width> 75 </Width>
<Height> 42 </Height>
<ID> 000083 </ID>
</Language>
</Button>
@ -1545,7 +1570,10 @@
<Value> text_price_d2 </Value>
</Text>
<Text>
<X> 852 </X>
; x for blend rng.
<X> text_show_blend_x </X>
<Y> 85 </Y>
<Font> KanitRegularTTF </Font>
<Size> 23 </Size>
@ -1553,15 +1581,7 @@
<Color> text_blender_color </Color>
<Value> text_price_d3 </Value>
</Text>
<Text>
<X> 872 </X>
<Y> 85 </Y>
<Font> KanitRegularTTF </Font>
<State> text_show_eng</State>
<Size> 23 </Size>
<Color> text_blender_color </Color>
<Value> text_price_d3 </Value>
</Text>
</Block>
@ -2907,7 +2927,7 @@
<Text>
<State> LidDeactiveButton </State>
<X> 602 </X>
<Y> 158 </Y>
<Y> 144 </Y>
<Width> 290 </Width>
<Height> 72 </Height>
<Language>
@ -3025,12 +3045,12 @@
</EventClick>
</Button>
<Image>
<State> StrawDeactiveButton </State>
<X> 602 </X>
<Y> 64 </Y>
<Filename> Var( DirImage + "/text20.png" ) </Filename>
</Image>
;<Image>
;<State> StrawDeactiveButton </State>
;<X> 602 </X>
;<Y> 64 </Y>
;<Filename> Var( DirImage + "/text20.png" ) </Filename>
;</Image>
</Block>
@ -3059,8 +3079,8 @@
<Button>
<X> 44 </X>
<Y> 1785 </Y>
<Filename> Var( DirImage + "/bn_cancel.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
<Filename> "ROOT/taobin_project/image/topping_inter/bn_cancel.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping_inter/bp_cancel.png"</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -3074,6 +3094,13 @@
EndIf
</EventClick>
<Language>
<X> 53 </X>
<Y> 16 </Y>
<Width> 120 </Width>
<Height> 42 </Height>
<ID> 000074 </ID>
</Language>
</Button>
@ -3163,8 +3190,8 @@
<Button>
<X> 673 </X>
<Y> 1785 </Y>
<Filename> Var( DirImage + "/bn_next.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_next.png" )</FilenamePress>
<Filename> "ROOT/taobin_project/image/topping_inter/bn_next.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping_inter/bp_next.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -3344,6 +3371,15 @@
DEBUGVAR CustomerFilterEnable
DEBUGVAR CustomerFilterType
If LanguageShow = "ENG" Then
Var show_eng = "true"
EndIf
If LanguageShow = "THAI" Then
Var show_eng = "false"
EndIf
GetLongTimeInMinute LastTimeClickOrder
@ -3384,6 +3420,11 @@
</EventClick>
<Language>
<X> 64 </X>
<Y> 19 </Y>
<ID> 000073 </ID>
</Language>
</Button>
@ -3471,12 +3512,15 @@
If SelectCountDrinkType = 1 Then
If DefaultDrinkType = 1 Then
Var hot_button_state = "PressForever"
Var IndexDrinktType = 0
EndIf
If DefaultDrinkType = 2 Then
Var cold_button_state = "PressForever"
Var IndexDrinktType = 1
EndIf
If DefaultDrinkType = 3 Then
Var blend_button_state = "PressForever"
Var IndexDrinktType = 2
EndIf
EndIf

View file

@ -5,7 +5,7 @@
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
Var UserSeletedSugar = 0
@ -456,7 +456,7 @@
;Open PreviseXMLFileName2
DEBUGVAR OpenFromXML
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
Open OpenFromXML

View file

@ -9,7 +9,7 @@
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
DEBUGVAR Top2Timeout
;DEBUGVAR Top2Timeout
Var Top2Timeout = Top2Timeout + 1
If Top2Timeout = 30 Then
@ -23,7 +23,7 @@
<X> 1 </X>
<Y> 1 </Y>
<Font> KanitTTF </Font>
<Size> 40 </Size>
<Size> 20 </Size>
<Width> 1080 </Width>
<Color> 0xFF0000 </Color>
<Value> "Beta"</Value>

View file

@ -106,8 +106,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
Var XMLPageVersion = "6.98"
Var XMLPageVersionInt = 698
Var XMLPageVersion = "6.99"
Var XMLPageVersionInt = 699
</EventOpen>
<Text>