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

All topping

Browse source
This commit is contained in:
kong 2021-05-05 22:15:57 +07:00
parent 466128263d
commit 9a6d51ff78
7 changed files with 188 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/topping/img_ontop_shot.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

BIN
image/topping/img_ontop_shot2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

BIN
image/topping_en/block_strawlid.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

Before After
Before After

BIN
image/topping_en/img_ontop_shot.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

6
xml/page_lid_straw.xml
View file

@ -79,6 +79,12 @@
Var PictureFile = PictureFile + "1" Var PictureFile = PictureFile + "1"
Var PictureFile = PictureFile + PictureEnd Var PictureFile = PictureFile + PictureEnd
If lidAndStrawOldPageIgnore = "true" Then
Var lidAndStrawOldPageIgnore = "false"
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
STRCONTAIN "9701" BrewParam IgnoreLidStraw STRCONTAIN "9701" BrewParam IgnoreLidStraw
DEBUGVAR BrewParam DEBUGVAR BrewParam

3
xml/page_topping_alter.xml
View file

@ -5,7 +5,8 @@
<Background> "0xeae6e1" </Background> <Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOpen> <EventOpen>
If JXMLVersionInt > 325 Then DEBUGVAR JXMLVersionInt
If JXMLVersionInt > 324 Then
Open "ROOT/taobin_project/xml/page_topping_select.xml" Open "ROOT/taobin_project/xml/page_topping_select.xml"
EndIf EndIf

239
xml/page_topping_select.xml
View file

@ -5,7 +5,10 @@
<Background> "0xeae6e1" </Background> <Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOpen> <EventOpen>
Var y_topping_bg = 912
; On open ; On open
Var lidAndStrawOldPageIgnore = "true"
Var SugarState1 = "Invisible" Var SugarState1 = "Invisible"
Var SugarState2 = "Invisible" Var SugarState2 = "Invisible"
Var SugarState3 = "Invisible" Var SugarState3 = "Invisible"
@ -17,7 +20,8 @@
Var BGSugar = "Invisible" Var BGSugar = "Invisible"
Var ShotCoffeeBG = "Invisible" Var ShotCoffeeBG = "Invisible"
Var showShotEnable = "Invisible" Var showShotEnable = "Invisible"
Var ShotCoffeePremium = "Invisible"
Var StarwState = "Enable" Var StarwState = "Enable"
@ -26,22 +30,6 @@
;SAVELOG PreviseXMLFileName2 ;SAVELOG PreviseXMLFileName2
;- Layout
Var y_sugar_block = 105
Var y_block = 206
Var y_topping_bg = 912
Var y_topping = 912 + y_sugar_block
Var y2_topping_bg = y_topping_bg + y_block
Var y2_topping = y_topping + y_block
Var y_shot_coffee_bg = y2_topping_bg
Var y_shot_coffee_bt = y2_topping + 100
Var y_lid_straw_bg = y_topping
Var topping1 = "1" Var topping1 = "1"
@ -71,18 +59,13 @@
EndIf EndIf
Var LidState = "Enable"
If LidState = "Enable" Then
Var ShowLidStraw = "Enable"
Var ShowLidOnly = "Invisible"
Else
Var ShowLidStraw = "Invisible"
Var ShowLidOnly = "Enable"
EndIf
Var backGroundAddExtra = DirImage + "/extra_img_1.png" Var backGroundAddExtra = DirImage + "/img_ontop_shot.png"
Var backGroundAddExtra2 = DirImage + "/img_ontop_shot2.png"
CRLFToSpace showname CRLFToSpace showname
CRLFToSpace showdesc CRLFToSpace showdesc
@ -148,7 +131,8 @@
Var showdesc = DrinkDescriptionTH Var showdesc = DrinkDescriptionTH
EndIf EndIf
Var backGroundAddExtra = DirImage + "/extra_img_1.png" Var backGroundAddExtra = DirImage + "/img_ontop_shot.png"
Var backGroundAddExtra2 = DirImage + "/img_ontop_shot2.png"
CRLFToSpace showname CRLFToSpace showname
CRLFToSpace showdesc CRLFToSpace showdesc
@ -206,7 +190,7 @@
DEBUGVAR toppingID2index5 DEBUGVAR toppingID2index5
DEBUGVAR MenuCodeName DEBUGVAR MenuCodeName
@ -215,10 +199,33 @@
DEBUGVAR toppingID3Default DEBUGVAR toppingID3Default
DEBUGVAR BrewParam
If BugFlag = 1 Then If BugFlag = 1 Then
Else Else
STRCONTAIN "9701" BrewParam IgnoreLidStraw
DEBUGVAR BrewParam
DEBUGVAR IgnoreLidStraw
If IgnoreLidStraw = "true" Then
Var IgnoreLidStraw = "false"
Var ShowLidStraw = "Invisible"
Var ShowLidOnly = "Invisible"
Else
If LidState = "Enable" Then
Var ShowLidStraw = "Enable"
Var ShowLidOnly = "Invisible"
Else
Var ShowLidStraw = "Invisible"
Var ShowLidOnly = "Enable"
EndIf
EndIf
;PressForever ;PressForever
If TOPPING1 = "Sugar" Then If TOPPING1 = "Sugar" Then
Var ShiftSugarStep = 1 Var ShiftSugarStep = 1
@ -372,14 +379,10 @@
If TOPPING2 = "shot coffee" Then If TOPPING2 = "shot coffee" Then
Var y_shot_coffee_bg = y2_topping_bg
Var y_shot_coffee_bt = y_shot_coffee_bg + 100
Var ShotCoffeeBG = "Enable" Var ShotCoffeeBG = "Enable"
Var showShotEnable = "Enable" Var showShotEnable = "Enable"
;Var ShotCoffeeBG = "Invisible"
;Var showShotEnable = "Invisible"
Var y_lid_straw_bg = y_shot_coffee_bg + y_block
DEBUGVAR TOPPING2 DEBUGVAR TOPPING2
Refresh Refresh
EndIf EndIf
@ -387,14 +390,17 @@
If TOPPING2 = "shot coffee termtem" Then If TOPPING2 = "shot coffee termtem" Then
Var y_shot_coffee_bg = y2_topping_bg
Var y_shot_coffee_bt = y_shot_coffee_bg + 100
Var ShotCoffeeBG = "Enable" Var ShotCoffeeBG = "Enable"
Var showShotEnable = "Enable" Var showShotEnable = "Enable"
;Var ShotCoffeeBG = "Invisible"
;Var showShotEnable = "Invisible"
Var y_lid_straw_bg = y_shot_coffee_bg + y_block DEBUGVAR TOPPING2
Refresh
EndIf
If TOPPING2 = "shot coffee 1003" Then
Var ShotCoffeePremium = "Enable"
Var showShotEnable = "Enable"
DEBUGVAR TOPPING2 DEBUGVAR TOPPING2
Refresh Refresh
@ -534,7 +540,7 @@
<Block> <Block>
<Width> 986 </Width> <Width> 986 </Width>
<Height> 210 </Height> <Height> 210 </Height>
<MarginTop> 22 </MarginTop> <MarginTop> 5 </MarginTop>
<State> BGSugar </State> <State> BGSugar </State>
; sugar layout ; sugar layout
<Image> <Image>
@ -725,12 +731,20 @@
</Button> </Button>
;- END topping1 ;- END topping1
</Block> </Block>
;
;
;
;
;
;
;
;
;
;-BEGIN shot layout ;-BEGIN shot layout
<Block> <Block>
<Width> 986 </Width> <Width> 986 </Width>
<Height> 232 </Height> <Height> 232 </Height>
<MarginTop> 22 </MarginTop> <MarginTop> 5 </MarginTop>
<State> ShotCoffeeBG </State> <State> ShotCoffeeBG </State>
<Image> <Image>
<Filename> backGroundAddExtra </Filename> <Filename> backGroundAddExtra </Filename>
@ -738,12 +752,12 @@
; ;
<Button> <Button>
<X> 56 </X> <X> 48 </X>
<Y> 102 </Y> <Y> 102 </Y>
<State> showShotEnable </Stage> <State> showShotEnable </Stage>
<Mode> "No" </Mode> <Mode> "No" </Mode>
<Filename> Var( DirImage + "/add_shot_img.png" ) </Filename> <Filename> "ROOT/taobin_project/image/topping/bn_shot_1.png" </Filename>
<FilenamePress> Var( DirImage + "/add_shot_img_2.png" ) </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/topping/bp_shot_1.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
@ -799,16 +813,106 @@
</EventClick> </EventClick>
</Button> </Button>
</Block> </Block>
;-END ;-END
;
;
;
;
;
;
;
;
;
;-BEGIN shot layout
<Block>
<Width> 986 </Width>
<Height> 232 </Height>
<MarginTop> 5 </MarginTop>
<State> ShotCoffeePremium </State>
<Image>
<Filename> backGroundAddExtra2 </Filename>
</Image>
;
<Button>
<X> 48 </X>
<Y> 102 </Y>
<State> showShotEnable </Stage>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/topping/bn_shot_2.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping/bp_shot_2.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
SAVELOG showShotEnable
If showShotEnable = "Press" Then
Var showShotEnable = "Enable"
Var PriceDrinkTmp = PriceDrinkNoTop
Var topping2 = toppingID2index1
Else
Var showShotEnable = "Press"
Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2
Var topping2 = toppingID2index2
EndIf
Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
SAVELOG PriceDrinkTmp
Refresh
</EventClick>
</Button>
;
<Button>
<X> 881 </X>
<Y> 102 </Y>
<State> showShotEnable </Stage>
<Mode> "No" </Mode>
<Filename> Var( DirImage + "/cb_nch.png" ) </Filename>
<FilenamePress> Var( DirImage + "/cb_ch.png" ) </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
SAVELOG showShotEnable
If showShotEnable = "Press" Then
Var showShotEnable = "Enable"
Var PriceDrinkTmp = PriceDrinkNoTop
Var topping2 = toppingID2index1
Else
Var showShotEnable = "Press"
Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2
Var topping2 = toppingID2index2
EndIf
Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
SAVELOG PriceDrinkTmp
Refresh
</EventClick>
</Button>
</Block>
;-END
;
;
;
;
;
;
;
;
;
;-BEGIN Lid straw ;-BEGIN Lid straw
<Block> <Block>
<Width> 986 </Width> <Width> 986 </Width>
<Height> 232 </Height> <Height> 232 </Height>
<MarginTop> 22 </MarginTop> <MarginTop> 5 </MarginTop>
<State> ShowLidOnly </State> <State> ShowLidOnly </State>
<Image> <Image>
<State> "Enable" </State> <State> "Enable" </State>
@ -822,8 +926,8 @@
<Y> 95 </Y> <Y> 95 </Y>
<State> StarwState </State> <State> StarwState </State>
<Mode> "No" </Mode> <Mode> "No" </Mode>
<Filename> Var( DirImage + "/bnstraw.png" )</Filename> <Filename> "ROOT/taobin_project/image/topping/bnstraw.png" </Filename>
<FilenamePress> Var( DirImage + "/bpstraw.png" )</FilenamePress> <FilenamePress> "ROOT/taobin_project/image/topping/bpstraw.png" </FilenamePress>
<EventClick> <EventClick>
SAVELOG StarwState SAVELOG StarwState
If StarwState = "Press" Then If StarwState = "Press" Then
@ -836,11 +940,11 @@
</Button> </Button>
<Button> <Button>
<X> 873 </X> <X> 881 </X>
<Y> 105 </Y> <Y> 105 </Y>
<State> StarwState </State> <State> StarwState </State>
<Mode> "No" </Mode> <Mode> "No" </Mode>
Filename> "ROOT/taobin_project/image/topping/bn_checkbox.png" </Filename> <Filename> "ROOT/taobin_project/image/topping/bn_checkbox.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping/bp_checkbox.png" </FilenamePress> <FilenamePress> "ROOT/taobin_project/image/topping/bp_checkbox.png" </FilenamePress>
<EventClick> <EventClick>
SAVELOG StarwState SAVELOG StarwState
@ -855,12 +959,21 @@ Filename> "ROOT/taobin_project/image/topping/bn_checkbox.png" </Filename>
</Block> </Block>
;- END ;- END
;
;
;
;
;
;
;
;
;
;-BEGIN Lid straw ;-BEGIN Lid straw
<Block> <Block>
<Width> 986 </Width> <Width> 986 </Width>
<Height> 274 </Height> <Height> 274 </Height>
<MarginTop> 22 </MarginTop> <MarginTop> 5 </MarginTop>
<State> ShowLidStraw </State> <State> ShowLidStraw </State>
<Image> <Image>
<Filename> Var( DirImage + "/block_strawlid.png" ) </Filename> <Filename> Var( DirImage + "/block_strawlid.png" ) </Filename>
@ -872,8 +985,8 @@ Filename> "ROOT/taobin_project/image/topping/bn_checkbox.png" </Filename>
<Y> 95 </Y> <Y> 95 </Y>
<State> StarwState </State> <State> StarwState </State>
<Mode> "No" </Mode> <Mode> "No" </Mode>
<Filename> Var( DirImage + "/bnstraw.png" )</Filename> <Filename> "ROOT/taobin_project/image/topping/bnstraw.png" </Filename>
<FilenamePress> Var( DirImage + "/bpstraw.png" )</FilenamePress> <FilenamePress> "ROOT/taobin_project/image/topping/bpstraw.png" </FilenamePress>
<EventClick> <EventClick>
SAVELOG "Click straw cb" SAVELOG "Click straw cb"
If StarwState = "Press" Then If StarwState = "Press" Then
@ -886,7 +999,7 @@ Filename> "ROOT/taobin_project/image/topping/bn_checkbox.png" </Filename>
</Button> </Button>
<Button> <Button>
<X> 873 </X> <X> 881 </X>
<Y> 105 </Y> <Y> 105 </Y>
<State> StarwState </State> <State> StarwState </State>
<Mode> "No" </Mode> <Mode> "No" </Mode>
@ -909,8 +1022,8 @@ Filename> "ROOT/taobin_project/image/topping/bn_checkbox.png" </Filename>
<Y> 175 </Y> <Y> 175 </Y>
<State> LidState </State> <State> LidState </State>
<Mode> "No" </Mode> <Mode> "No" </Mode>
<Filename> Var( DirImage + "/bnlid.png" )</Filename> <Filename> "ROOT/taobin_project/image/topping/bnlid.png" </Filename>
<FilenamePress> Var( DirImage + "/bplid.png" )</FilenamePress> <FilenamePress> "ROOT/taobin_project/image/topping/bplid.png" </FilenamePress>
<EventClick> <EventClick>
SAVELOG "Click LID pic" SAVELOG "Click LID pic"
If LidState = "Press" Then If LidState = "Press" Then
@ -923,7 +1036,7 @@ Filename> "ROOT/taobin_project/image/topping/bn_checkbox.png" </Filename>
</Button> </Button>
<Button> <Button>
<X> 873 </X> <X> 881 </X>
<Y> 185 </Y> <Y> 185 </Y>
<State> LidState </State> <State> LidState </State>
<Mode> "No" </Mode> <Mode> "No" </Mode>
@ -940,7 +1053,15 @@ Filename> "ROOT/taobin_project/image/topping/bn_checkbox.png" </Filename>
</EventClick> </EventClick>
</Button> </Button>
</Block> </Block>
;
;
;
;
;
;
;
;
;
</FrameScroll> </FrameScroll>
<EventSecurity> <EventSecurity>