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

8.62

Browse source
This commit is contained in:
wanlop run 2024-07-01 11:41:33 +07:00
parent 324e18880d
commit b5b55ffe3c
4 changed files with 45 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

28
xml/page_catalog_group_other.xml
View file

@ -4821,19 +4821,19 @@ Soda & Ice" </Value>
</Block> </Block>
; - - - ; - - -
; ==================> Len = 12 ; ==================> Len = 12
; 12-05-02-0105 12-05-03-0105 ; - 12-05-02-0105 12-05-03-0105
<Block> <Block>
<MarginLeft> 33 </MarginLeft> <MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop> <MarginTop> 22 </MarginTop>
<Width> 225 </Width> <Width> 225 </Width>
<Height> 296 </Height> <Height> 296 </Height>
<State> Flag( .Button,12-05-02-0105.Button,12-05-03-0105.Button,$Sum12050201051205030105) </State> <State> Flag( 12-05-02-0105.Button,12-05-03-0105.Button,$Sum12050201051205030105) </State>
<Button> <Button>
<State> $Sum12050201051205030105 </State> <State> $Sum12050201051205030105 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_Melon.png" </Filename> <Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_Melon.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_Melon.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_Melon.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_Melon.png" </FilenameDisable> <FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_Melon.png" </FilenameDisable>
<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage> <OverlayImage> xmlpro( 12-05-03-0105, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOnClick> <EventOnClick>
@ -4843,7 +4843,7 @@ Soda & Ice" </Value>
Var DrinkDescription = "Pepsi, Melon Syrup& Ice" Var DrinkDescription = "Pepsi, Melon Syrup& Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_Melon.png" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_Melon.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $.Price Var PriceD1 = $-.Price
Var PriceD2 = $12-05-02-0105.Price Var PriceD2 = $12-05-02-0105.Price
Var PriceD3 = $12-05-03-0105.Price Var PriceD3 = $12-05-03-0105.Price
Var PD_CODE1 = "##-##-##-####" Var PD_CODE1 = "##-##-##-####"
@ -4852,7 +4852,7 @@ Soda & Ice" </Value>
Var PD_STAGE_1 = "Disable2" Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = $12-05-02-0105.Button Var PD_STAGE_2 = $12-05-02-0105.Button
Var PD_STAGE_3 = $12-05-03-0105.Button Var PD_STAGE_3 = $12-05-03-0105.Button
Var OverlayMenuFilter !assigned xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png") Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0105, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
DEBUGVAR OverlayMenuFilter DEBUGVAR OverlayMenuFilter
Var SelectCountDrinkType = 0 Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0 Var DefaultDrinkType = 0
@ -4872,7 +4872,7 @@ Soda & Ice" </Value>
Topping "Load" "12-05-02-0105" Topping "Load" "12-05-02-0105"
Else Else
If PD_STAGE_1 = "Enable" Then If PD_STAGE_1 = "Enable" Then
Topping "Load" "" Topping "Load" "-"
Else Else
Topping "Load" "12-05-03-0105" Topping "Load" "12-05-03-0105"
EndIf EndIf
@ -4965,7 +4965,7 @@ Soda & Ice" </Value>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable> <ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State> <State> "Invisible" </State>
<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test <Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text> </Text>
<Image> <Image>
<X> 81 </X> <X> 81 </X>
@ -5574,19 +5574,19 @@ Soda & Ice" </Value>
</Block> </Block>
; - - - ; - - -
; ==================> Len = 12 ; ==================> Len = 12
; 12-05-02-0106 - ; - 12-05-02-0106 -
<Block> <Block>
<MarginLeft> 33 </MarginLeft> <MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop> <MarginTop> 22 </MarginTop>
<Width> 225 </Width> <Width> 225 </Width>
<Height> 296 </Height> <Height> 296 </Height>
<State> Flag( .Button,12-05-02-0106.Button,$Sum1205020106) </State> <State> Flag( 12-05-02-0106.Button,$Sum1205020106) </State>
<Button> <Button>
<State> $Sum1205020106 </State> <State> $Sum1205020106 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_yuzu.png" </Filename> <Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_yuzu.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_yuzu.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_yuzu.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_yuzu.png" </FilenameDisable> <FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_yuzu.png" </FilenameDisable>
<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage> <OverlayImage> xmlpro( 12-05-02-0106, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOnClick> <EventOnClick>
@ -5596,7 +5596,7 @@ Soda & Ice" </Value>
Var DrinkDescription = "Pepsi, Yuzu Syrup& Ice" Var DrinkDescription = "Pepsi, Yuzu Syrup& Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_yuzu.png" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_yuzu.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $.Price Var PriceD1 = $-.Price
Var PriceD2 = $12-05-02-0106.Price Var PriceD2 = $12-05-02-0106.Price
Var PriceD3 = $-.Price Var PriceD3 = $-.Price
Var PD_CODE1 = "##-##-##-####" Var PD_CODE1 = "##-##-##-####"
@ -5605,7 +5605,7 @@ Soda & Ice" </Value>
Var PD_STAGE_1 = "Disable2" Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = $12-05-02-0106.Button Var PD_STAGE_2 = $12-05-02-0106.Button
Var PD_STAGE_3 = "Disable2" Var PD_STAGE_3 = "Disable2"
Var OverlayMenuFilter !assigned xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png") Var OverlayMenuFilter !assigned xmlpro( 12-05-02-0106, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
DEBUGVAR OverlayMenuFilter DEBUGVAR OverlayMenuFilter
Var SelectCountDrinkType = 0 Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0 Var DefaultDrinkType = 0
@ -5625,7 +5625,7 @@ Soda & Ice" </Value>
Topping "Load" "12-05-02-0106" Topping "Load" "12-05-02-0106"
Else Else
If PD_STAGE_1 = "Enable" Then If PD_STAGE_1 = "Enable" Then
Topping "Load" "" Topping "Load" "-"
Else Else
Topping "Load" "-" Topping "Load" "-"
EndIf EndIf
@ -5718,7 +5718,7 @@ Soda & Ice" </Value>
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable> <ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State> <State> "Invisible" </State>
<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test <Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text> </Text>
<Image> <Image>
<X> 81 </X> <X> 81 </X>

28
xml/page_catalog_group_pepsi_7up.xml
View file

@ -1796,19 +1796,19 @@
</Block> </Block>
; - - - ; - - -
; ==================> Len = 12 ; ==================> Len = 12
; 12-05-02-0105 12-05-03-0105 ; - 12-05-02-0105 12-05-03-0105
<Block> <Block>
<MarginLeft> 33 </MarginLeft> <MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop> <MarginTop> 22 </MarginTop>
<Width> 225 </Width> <Width> 225 </Width>
<Height> 296 </Height> <Height> 296 </Height>
<State> Flag( .Button,12-05-02-0105.Button,12-05-03-0105.Button,$Sum12050201051205030105) </State> <State> Flag( 12-05-02-0105.Button,12-05-03-0105.Button,$Sum12050201051205030105) </State>
<Button> <Button>
<State> $Sum12050201051205030105 </State> <State> $Sum12050201051205030105 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_Melon.png" </Filename> <Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_Melon.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_Melon.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_Melon.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_Melon.png" </FilenameDisable> <FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_Melon.png" </FilenameDisable>
<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage> <OverlayImage> xmlpro( 12-05-03-0105, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOnClick> <EventOnClick>
@ -1818,7 +1818,7 @@
Var DrinkDescription = "Pepsi, Melon Syrup& Ice" Var DrinkDescription = "Pepsi, Melon Syrup& Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_Melon.png" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_Melon.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $.Price Var PriceD1 = $-.Price
Var PriceD2 = $12-05-02-0105.Price Var PriceD2 = $12-05-02-0105.Price
Var PriceD3 = $12-05-03-0105.Price Var PriceD3 = $12-05-03-0105.Price
Var PD_CODE1 = "##-##-##-####" Var PD_CODE1 = "##-##-##-####"
@ -1827,7 +1827,7 @@
Var PD_STAGE_1 = "Disable2" Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = $12-05-02-0105.Button Var PD_STAGE_2 = $12-05-02-0105.Button
Var PD_STAGE_3 = $12-05-03-0105.Button Var PD_STAGE_3 = $12-05-03-0105.Button
Var OverlayMenuFilter !assigned xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png") Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0105, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
DEBUGVAR OverlayMenuFilter DEBUGVAR OverlayMenuFilter
Var SelectCountDrinkType = 0 Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0 Var DefaultDrinkType = 0
@ -1847,7 +1847,7 @@
Topping "Load" "12-05-02-0105" Topping "Load" "12-05-02-0105"
Else Else
If PD_STAGE_1 = "Enable" Then If PD_STAGE_1 = "Enable" Then
Topping "Load" "" Topping "Load" "-"
Else Else
Topping "Load" "12-05-03-0105" Topping "Load" "12-05-03-0105"
EndIf EndIf
@ -1940,7 +1940,7 @@
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable> <ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State> <State> "Invisible" </State>
<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test <Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text> </Text>
<Image> <Image>
<X> 81 </X> <X> 81 </X>
@ -2549,19 +2549,19 @@
</Block> </Block>
; - - - ; - - -
; ==================> Len = 12 ; ==================> Len = 12
; 12-05-02-0106 - ; - 12-05-02-0106 -
<Block> <Block>
<MarginLeft> 33 </MarginLeft> <MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop> <MarginTop> 22 </MarginTop>
<Width> 225 </Width> <Width> 225 </Width>
<Height> 296 </Height> <Height> 296 </Height>
<State> Flag( .Button,12-05-02-0106.Button,$Sum1205020106) </State> <State> Flag( 12-05-02-0106.Button,$Sum1205020106) </State>
<Button> <Button>
<State> $Sum1205020106 </State> <State> $Sum1205020106 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_yuzu.png" </Filename> <Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_yuzu.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_yuzu.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_yuzu.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_yuzu.png" </FilenameDisable> <FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_yuzu.png" </FilenameDisable>
<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage> <OverlayImage> xmlpro( 12-05-02-0106, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOnClick> <EventOnClick>
@ -2571,7 +2571,7 @@
Var DrinkDescription = "Pepsi, Yuzu Syrup& Ice" Var DrinkDescription = "Pepsi, Yuzu Syrup& Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_yuzu.png" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_yuzu.png"
Var OpenFromXML = CurrentXMLFileName2 Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $.Price Var PriceD1 = $-.Price
Var PriceD2 = $12-05-02-0106.Price Var PriceD2 = $12-05-02-0106.Price
Var PriceD3 = $-.Price Var PriceD3 = $-.Price
Var PD_CODE1 = "##-##-##-####" Var PD_CODE1 = "##-##-##-####"
@ -2580,7 +2580,7 @@
Var PD_STAGE_1 = "Disable2" Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = $12-05-02-0106.Button Var PD_STAGE_2 = $12-05-02-0106.Button
Var PD_STAGE_3 = "Disable2" Var PD_STAGE_3 = "Disable2"
Var OverlayMenuFilter !assigned xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png") Var OverlayMenuFilter !assigned xmlpro( 12-05-02-0106, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
DEBUGVAR OverlayMenuFilter DEBUGVAR OverlayMenuFilter
Var SelectCountDrinkType = 0 Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0 Var DefaultDrinkType = 0
@ -2600,7 +2600,7 @@
Topping "Load" "12-05-02-0106" Topping "Load" "12-05-02-0106"
Else Else
If PD_STAGE_1 = "Enable" Then If PD_STAGE_1 = "Enable" Then
Topping "Load" "" Topping "Load" "-"
Else Else
Topping "Load" "-" Topping "Load" "-"
EndIf EndIf
@ -2693,7 +2693,7 @@
<Color> 0x6F5F51 </Color> <Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable> <ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State> <State> "Invisible" </State>
<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test <Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text> </Text>
<Image> <Image>
<X> 81 </X> <X> 81 </X>

26
xml/page_remove_cup.xml
View file

@ -76,17 +76,6 @@
EndIf EndIf
If show_eng = "true" Then
Else
If Timeout = 0 Then
If CupChecking = "false" Then
If DoorCupPosition = "bottom" Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
EndIf
EndIf
EndIf
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
@ -156,6 +145,21 @@
EndIf EndIf
EndIf EndIf
If show_eng = "true" Then
Else
If Timeout = 0 Then
If buttonRemoveCup = "Enable" Then
If CupChecking = "false" Then
If DoorCupPosition = "bottom" Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
EndIf
EndIf
EndIf
EndIf
Refresh Refresh
TimerReset TimerReset

4
xml_main/startup.xml
View file

@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0 Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0 Var RandomSalePackage = 0
Var XMLPageVersion = "8.61" Var XMLPageVersion = "8.62"
Var XMLPageVersionInt = 861 Var XMLPageVersionInt = 862
;Oreo ;Oreo
Var OreoGuarantee = 0 Var OreoGuarantee = 0