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

update coffee playground

Browse source
This commit is contained in:
Kenta420 2023-10-25 17:27:51 +07:00
parent 6856efaed0
commit af647dfa43
3 changed files with 123 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/topping2/bg_custom_coffee_level.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

Before After
Before After

BIN
image/topping2_en/bg_custom_coffee_level.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5 KiB

Before After
Before After

144
xml/page_topping_select8.xml
View file

@ -101,6 +101,7 @@
Var CustomCoffeeLevelState[0] = "Enable"
Var CustomCoffeeLevelState[1] = "Enable"
Var CustomCoffeeLevelState[2] = "Enable"
Var CustomCoffeeLevelState[3] = "Enable"
Var CustomCoffeeTampingState[0] = "Enable"
Var CustomCoffeeTampingState[1] = "Enable"
@ -173,16 +174,17 @@
Var CustomCoffeeLevelText[0] = "Medium"
Var CustomCoffeeLevelText[1] = "Just Right"
Var CustomCoffeeLevelText[2] = "Dark"
Var CustomCoffeeLevelText[3] = "Darker"
Var CustomCoffeeTampingText[0] = "Light"
Var CustomCoffeeTampingText[1] = "Medium"
Var CustomCoffeeTampingText[2] = "Hight"
Var custom_coffee_level_medium_text_x = 662
;Var custom_coffee_level_medium_text_x = 682
Var custom_coffee_level_medium_price_x = 723
Var custom_coffee_level_medium_text_x = 540
Var custom_coffee_level_medium_price_x = 600
Var custom_coffee_level_dark_text_x = 895
Var custom_coffee_level_darker_text_x = 880
Var custom_coffee_level_dark_text_x = 785
Else
Var DirImage = "ROOT/taobin_project/image/topping2"
@ -205,15 +207,17 @@
Var CustomCoffeeLevelText[0] = "กลาง"
Var CustomCoffeeLevelText[1] = "กำลังพอดี"
Var CustomCoffeeLevelText[2] = "เข้ม"
Var CustomCoffeeLevelText[3] = "เข้มกว่า"
Var CustomCoffeeTampingText[0] = "เบา"
Var CustomCoffeeTampingText[1] = "ปานกลาง"
Var CustomCoffeeTampingText[2] = "เน้น"
Var custom_coffee_level_medium_text_x = 680
Var custom_coffee_level_medium_price_x = 718
Var custom_coffee_level_medium_text_x = 560
Var custom_coffee_level_medium_price_x = 600
Var custom_coffee_level_dark_text_x = 905
Var custom_coffee_level_darker_text_x = 880
Var custom_coffee_level_dark_text_x = 790
EndIf
Var text_x_free_topping = text_x_add_oreo_price + text_x_free_adjust
@ -608,15 +612,17 @@
Var CustomCoffeeLevelText[0] = "Medium"
Var CustomCoffeeLevelText[1] = "Just Right"
Var CustomCoffeeLevelText[2] = "Dark"
Var CustomCoffeeLevelText[3] = "Darker"
Var CustomCoffeeTampingText[0] = "Light"
Var CustomCoffeeTampingText[1] = "Medium"
Var CustomCoffeeTampingText[2] = "Hight"
Var custom_coffee_level_medium_text_x = 662
Var custom_coffee_level_medium_price_x = 723
Var custom_coffee_level_medium_text_x = 540
Var custom_coffee_level_medium_price_x = 600
Var custom_coffee_level_dark_text_x = 895
Var custom_coffee_level_darker_text_x = 880
Var custom_coffee_level_dark_text_x = 785
Else
Var DirImage = "ROOT/taobin_project/image/topping2"
@ -639,16 +645,17 @@
Var CustomCoffeeLevelText[0] = "กลาง"
Var CustomCoffeeLevelText[1] = "กำลังพอดี"
Var CustomCoffeeLevelText[2] = "เข้ม"
Var CustomCoffeeLevelText[3] = "เข้มกว่า"
Var CustomCoffeeTampingText[0] = "เบา"
Var CustomCoffeeTampingText[1] = "ปานกลาง"
Var CustomCoffeeTampingText[2] = "เน้น"
Var custom_coffee_level_medium_text_x = 680
Var custom_coffee_level_medium_price_x = 718
Var custom_coffee_level_dark_text_x = 905
Var custom_coffee_level_medium_text_x = 560
Var custom_coffee_level_medium_price_x = 600
Var custom_coffee_level_darker_text_x = 880
Var custom_coffee_level_dark_text_x = 790
EndIf
Var text_x_free_topping = text_x_add_oreo_price + text_x_free_adjust
@ -818,6 +825,7 @@
DEBUGVAR toppingID9index1
DEBUGVAR toppingID9index2
DEBUGVAR toppingID9index3
DEBUGVAR toppingID9index4
DEBUGVAR toppingID10index1
DEBUGVAR toppingID10index2
@ -865,6 +873,7 @@
DEBUGVAR toppingID9price1
DEBUGVAR toppingID9price2
DEBUGVAR toppingID9price3
DEBUGVAR toppingID9price4
DEBUGVAR BrewParam
@ -1010,6 +1019,7 @@
Var CustomCoffeeLevelState[0] = "PressForever"
Var CustomCoffeeLevelState[1] = "Enable"
Var CustomCoffeeLevelState[2] = "Enable"
Var CustomCoffeeLevelState[3] = "Enable"
EndIf
@ -1018,6 +1028,7 @@
Var CustomCoffeeLevelState[0] = "Enable"
Var CustomCoffeeLevelState[1] = "PressForever"
Var CustomCoffeeLevelState[2] = "Enable"
Var CustomCoffeeLevelState[3] = "Enable"
EndIf
If toppingID9index3 = toppingID9Default Then
@ -1025,6 +1036,15 @@
Var CustomCoffeeLevelState[0] = "Enable"
Var CustomCoffeeLevelState[1] = "Enable"
Var CustomCoffeeLevelState[2] = "PressForever"
Var CustomCoffeeLevelState[3] = "Enable"
EndIf
If toppingID9index4 = toppingID9Default Then
Var CurrentCoffeeLevelId = toppingID9index4
Var CustomCoffeeLevelState[0] = "Enable"
Var CustomCoffeeLevelState[1] = "Enable"
Var CustomCoffeeLevelState[2] = "Enable"
Var CustomCoffeeLevelState[3] = "PressForever"
EndIf
EndIf
@ -1054,6 +1074,14 @@
Var CustomCoffeeLevelAdditionalPrice[2] = ""
EndIf
If toppingID9price4 > 0 Then
Var priceFormated !assigned StringFmt( toppingID9price4 , PriceCustomCoffeeFormat, PreScaleConvertShow)
Var CustomCoffeeLevelAdditionalPrice[3] = "(+" + priceFormated
Var CustomCoffeeLevelAdditionalPrice[3] = CustomCoffeeLevelAdditionalPrice[3] + ")"
Else
Var CustomCoffeeLevelAdditionalPrice[3] = ""
EndIf
EndIf
If TOPPING9 = "double-shot-espv2" Then
@ -1070,6 +1098,7 @@
Var CustomCoffeeLevelState[0] = "PressForever"
Var CustomCoffeeLevelState[1] = "Enable"
Var CustomCoffeeLevelState[2] = "Enable"
Var CustomCoffeeLevelState[3] = "Enable"
EndIf
@ -1078,6 +1107,7 @@
Var CustomCoffeeLevelState[0] = "Enable"
Var CustomCoffeeLevelState[1] = "PressForever"
Var CustomCoffeeLevelState[2] = "Enable"
Var CustomCoffeeLevelState[3] = "Enable"
EndIf
If toppingID9index3 = toppingID9Default Then
@ -1085,6 +1115,15 @@
Var CustomCoffeeLevelState[0] = "Enable"
Var CustomCoffeeLevelState[1] = "Enable"
Var CustomCoffeeLevelState[2] = "PressForever"
Var CustomCoffeeLevelState[3] = "Enable"
EndIf
If toppingID9index4 = toppingID9Default Then
Var CurrentCoffeeLevelId = toppingID9index4
Var CustomCoffeeLevelState[0] = "Enable"
Var CustomCoffeeLevelState[1] = "Enable"
Var CustomCoffeeLevelState[2] = "Enable"
Var CustomCoffeeLevelState[3] = "PressForever"
EndIf
EndIf
@ -1114,6 +1153,14 @@
Var CustomCoffeeLevelAdditionalPrice[2] = ""
EndIf
If toppingID9price4 > 0 Then
Var priceFormated !assigned StringFmt( toppingID9price4 , PriceCustomCoffeeFormat, PreScaleConvertShow)
Var CustomCoffeeLevelAdditionalPrice[3] = "(+" + priceFormated
Var CustomCoffeeLevelAdditionalPrice[3] = CustomCoffeeLevelAdditionalPrice[3] + ")"
Else
Var CustomCoffeeLevelAdditionalPrice[3] = ""
EndIf
EndIf
If TOPPING10 = "tampping-espv2" Then
@ -4072,8 +4119,8 @@
</Image>
<Button>
<X> 689 </X>
<Y> 5 </Y>
<X> 578 </X>
<Y> 5 </Y>
<State> CustomCoffeeLevelState[0] </State>
<Mode> "No" </Mode>
<Filename> Var( DirImage + "/cb_uncheck_new.png" ) </Filename>
@ -4085,6 +4132,7 @@
Var CustomCoffeeLevelState[0] = "PressForever"
Var CustomCoffeeLevelState[1] = "Enable"
Var CustomCoffeeLevelState[2] = "Enable"
Var CustomCoffeeLevelState[3] = "Enable"
Var CurrentCoffeeLevelId = toppingID9index1
@ -4096,7 +4144,7 @@
</Button>
<Button>
<X> 800 </X>
<X> 689 </X>
<Y> 5 </Y>
<State> CustomCoffeeLevelState[1] </State>
<Mode> "No" </Mode>
@ -4109,6 +4157,7 @@
Var CustomCoffeeLevelState[0] = "Enable"
Var CustomCoffeeLevelState[1] = "PressForever"
Var CustomCoffeeLevelState[2] = "Enable"
Var CustomCoffeeLevelState[3] = "Enable"
Var CurrentCoffeeLevelId = toppingID9index2
@ -4120,7 +4169,7 @@
</Button>
<Button>
<X> 911 </X>
<X> 800 </X>
<Y> 5 </Y>
<State> CustomCoffeeLevelState[2] </State>
<Mode> "No" </Mode>
@ -4133,6 +4182,7 @@
Var CustomCoffeeLevelState[0] = "Enable"
Var CustomCoffeeLevelState[1] = "Enable"
Var CustomCoffeeLevelState[2] = "PressForever"
Var CustomCoffeeLevelState[3] = "Enable"
Var CurrentCoffeeLevelId = toppingID9index3
@ -4141,6 +4191,32 @@
</EventClick>
</Button>
<Button>
<X> 911 </X>
<Y> 5 </Y>
<State> CustomCoffeeLevelState[3] </State>
<Mode> "No" </Mode>
<Filename> Var( DirImage + "/cb_uncheck_new.png" ) </Filename>
<FilenamePress> Var( DirImage + "/cb_checked_new.png" ) </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var CustomCoffeeLevelState[0] = "Enable"
Var CustomCoffeeLevelState[1] = "Enable"
Var CustomCoffeeLevelState[2] = "Enable"
Var CustomCoffeeLevelState[3] = "PressForever"
Var CurrentCoffeeLevelId = toppingID9index4
Function 2
</EventClick>
</Button>
@ -4155,7 +4231,7 @@
</Text>
<Text>
<X> 785 </X>
<X> 676 </X>
<Y> CustomCoffeeTextY </Y>
<Font> KanitRegularTTF </Font>
<State> showCoffeeLevel </State>
@ -4174,6 +4250,16 @@
<Value> CustomCoffeeLevelText[2] </Value>
</Text>
<Text>
<X> custom_coffee_level_darker_text_x </X>
<Y> CustomCoffeeTextY </Y>
<Font> KanitRegularTTF </Font>
<State> showCoffeeLevel </State>
<Size> 16 </Size>
<Color> 0x513C2F </Color>
<Value> CustomCoffeeLevelText[3] </Value>
</Text>
; Additional Price
<Text>
@ -4188,7 +4274,7 @@
<Text>
<X> 825 </X>
<X> 720 </X>
<Y> CustomCoffeeTextY </Y>
<Font> KanitRegularTTF </Font>
<State> showCoffeeLevel </State>
@ -4198,7 +4284,7 @@
</Text>
<Text>
<X> 930 </X>
<X> 820 </X>
<Y> CustomCoffeeTextY </Y>
<Font> KanitRegularTTF </Font>
<State> showCoffeeLevel </State>
@ -4207,6 +4293,16 @@
<Value> CustomCoffeeLevelAdditionalPrice[2] </Value>
</Text>
<Text>
<X> 930 </X>
<Y> CustomCoffeeTextY </Y>
<Font> KanitRegularTTF </Font>
<State> showCoffeeLevel </State>
<Size> 16 </Size>
<Color> 0x84776F </Color>
<Value> CustomCoffeeLevelAdditionalPrice[3] </Value>
</Text>
</Row1>
@ -5004,6 +5100,9 @@
If CustomCoffeeLevelState[2] = "PressForever" Then
Var topping9 = toppingID9index3
EndIf
If CustomCoffeeLevelState[3] = "PressForever" Then
Var topping9 = toppingID9index4
EndIf
Else
Var topping9 = 0
EndIf
@ -5582,6 +5681,9 @@
If CustomCoffeeLevelState[2] = "PressForever" Then
Var TOPPING_PRICE = TOPPING_PRICE + toppingID9price3
EndIf
If CustomCoffeeLevelState[3] = "PressForever" Then
Var TOPPING_PRICE = TOPPING_PRICE + toppingID9price4
EndIf
EndIf