6.74
This commit is contained in:
kong
parent
647c06c12c
commit
fdd2b59366
13 changed files with 380 additions and 374 deletions
|
|
@ -250,22 +250,19 @@
|
|||
If hot_button_state = "Disable2" Then
|
||||
Var text_price_d1 = ""
|
||||
Else
|
||||
Var text_price_d1 = "(฿" + PriceD1
|
||||
Var text_price_d1 = text_price_d1 + ")"
|
||||
Var text_price_d1 !assigned IntFormat( PriceD1 , DisplayFormat, PreScaleConvert)
|
||||
EndIf
|
||||
|
||||
If cold_button_state = "Disable2" Then
|
||||
Var text_price_d2 = ""
|
||||
Else
|
||||
Var text_price_d2 = "(฿" + PriceD2
|
||||
Var text_price_d2 = text_price_d2 + ")"
|
||||
Var text_price_d2 !assigned IntFormat( PriceD2 , DisplayFormat, PreScaleConvert)
|
||||
EndIf
|
||||
|
||||
If blend_button_state = "Disable2" Then
|
||||
Var text_price_d3 = ""
|
||||
Else
|
||||
Var text_price_d3 = "(฿" + PriceD3
|
||||
Var text_price_d3 = text_price_d3 + ")"
|
||||
Var text_price_d3 !assigned IntFormat( PriceD3 , DisplayFormat, PreScaleConvert)
|
||||
EndIf
|
||||
|
||||
DEBUGVAR PD_CODE1
|
||||
|
|
@ -423,9 +420,7 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
If new_layout = "true" Then
|
||||
Function 2
|
||||
EndIf
|
||||
Function 2
|
||||
|
||||
|
||||
RefreshAll
|
||||
|
|
@ -550,7 +545,19 @@
|
|||
EndIf
|
||||
|
||||
DEBUGVAR SubMenuGroupIDSlot6_1
|
||||
|
||||
|
||||
|
||||
; i f Hot menu disable away
|
||||
If hot_button_state = "PressForever" Then
|
||||
If showOreoAddEnable = "Enable" Then
|
||||
Var showOreoAddEnable = "Disable"
|
||||
EndIf
|
||||
If showOreoAddEnable = "Press" Then
|
||||
Var showOreoAddEnable = "Disable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
; first time.
|
||||
If blend_button_state = "PressForever" Then
|
||||
|
||||
Else
|
||||
|
|
@ -665,7 +672,6 @@
|
|||
EndIf
|
||||
|
||||
|
||||
|
||||
If UserSeletedSugar = 0 Then
|
||||
If SugarModeUpdateWhenChangeDrinkType = 1 Then
|
||||
Var SugarModeUpdateWhenChangeDrinkType = 0
|
||||
|
|
@ -819,6 +825,8 @@
|
|||
Var SugarState4 = "Enable"
|
||||
Var SugarState5 = "Enable"
|
||||
|
||||
DEBUGVAR "set default Powder Sugar"
|
||||
|
||||
If toppingID1index1 = toppingID1Default Then
|
||||
Var SugarState1 = "PressForever"
|
||||
Var sugar_default_flag = 1
|
||||
|
|
@ -847,6 +855,9 @@
|
|||
If sugar_default_flag = 0 Then
|
||||
Var SugarState1 = "PressForever"
|
||||
EndIf
|
||||
|
||||
DEBUGVAR toppingID1Default
|
||||
DEBUGVAR SugarState1
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -986,6 +997,8 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
DEBUGVAR SelectDrinkType
|
||||
|
||||
If SelectDrinkType = 0 Then
|
||||
Var SugarState1 = "Enable"
|
||||
Var SugarState2 = "Enable"
|
||||
|
|
@ -1150,9 +1163,10 @@
|
|||
DEBUGVAR showShotEnable
|
||||
DEBUGVAR showOreoAddEnable
|
||||
DEBUGVAR ShotCoffeePremium
|
||||
SAVELOG toppingID2price1
|
||||
SAVELOG toppingID2price2
|
||||
SAVELOG toppingID2price3
|
||||
DEBUGVAR toppingID2price1
|
||||
DEBUGVAR toppingID2price2
|
||||
DEBUGVAR toppingID2price3
|
||||
Function 2
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -1281,6 +1295,7 @@
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
Var SelectDrinkType = 1
|
||||
|
||||
SAVELOG "Press hot"
|
||||
|
||||
|
|
@ -1314,9 +1329,9 @@
|
|||
|
||||
Var high_light_drink_type = "Invisible"
|
||||
|
||||
Function 2
|
||||
;Function 2
|
||||
|
||||
Refresh
|
||||
;Refresh
|
||||
|
||||
|
||||
</EventClick>
|
||||
|
|
@ -1337,6 +1352,7 @@
|
|||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
Var SelectDrinkType = 1
|
||||
|
||||
SAVELOG "Press cold"
|
||||
|
||||
|
|
@ -1366,9 +1382,9 @@
|
|||
Var topping_price_refresh = 0
|
||||
Topping "Load" PD_CODE2
|
||||
|
||||
Function 2
|
||||
;Function 2
|
||||
|
||||
Refresh
|
||||
;Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -1389,6 +1405,7 @@
|
|||
<EventClick>
|
||||
|
||||
SAVELOG "Press blend"
|
||||
Var SelectDrinkType = 1
|
||||
|
||||
Var blend_button_state = "PressForever"
|
||||
|
||||
|
|
@ -1416,9 +1433,9 @@
|
|||
Var topping_price_refresh = 0
|
||||
Topping "Load" PD_CODE3
|
||||
|
||||
Function 2
|
||||
;Function 2
|
||||
|
||||
Refresh
|
||||
;Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -1462,93 +1479,93 @@
|
|||
|
||||
|
||||
|
||||
<Block>
|
||||
<Width> 986 </Width>
|
||||
<Height> 160 </Height>
|
||||
<MarginTop> 20 </MarginTop>
|
||||
<State> blendedStateShow </State>
|
||||
<Image>
|
||||
<Filename> Var( DirImage + "/bg_blended.png" )</Filename>
|
||||
</Image>
|
||||
|
||||
<Button>
|
||||
<X> 40 </X>
|
||||
<Y> 72 </Y>
|
||||
<State> blendedState </State>
|
||||
<Mode> "No" </Mode>
|
||||
<Animation>
|
||||
<Style> "shake-text" </Style>
|
||||
<OnEvent> "OnValueChange" </OnEvent>
|
||||
</Animation>
|
||||
<Filename> Var( DirImage + "/bn_blended.png" ) </Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_blended.png" ) </FilenamePress>
|
||||
<FilenameDisable> Var( DirImage + "/bd_blended.png" ) </FilenameDisable>
|
||||
<FilenameForce> Var( DirImage + "/bp_blended.png" ) </FilenameForce>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
SAVELOG "Press Smoothies"
|
||||
|
||||
If blendedState = "Press" Then
|
||||
Var blendedState = "Enable"
|
||||
Else
|
||||
Var blendedState = "Press"
|
||||
EndIf
|
||||
|
||||
Function 1
|
||||
|
||||
Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Button>
|
||||
<X> 896 </X>
|
||||
<Y> 79 </Y>
|
||||
<State> blendedState </State>
|
||||
<Mode> "No" </Mode>
|
||||
<Animation>
|
||||
<Style> "shake-text" </Style>
|
||||
<OnEvent> "OnValueChange" </OnEvent>
|
||||
</Animation>
|
||||
<Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
|
||||
<FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
|
||||
<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
|
||||
<FilenameForce> Var( DirImage + "/cb_force_checked.png" ) </FilenameForce>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
SAVELOG "Press Smoothies"
|
||||
|
||||
If blendedState = "Press" Then
|
||||
Var blendedState = "Enable"
|
||||
Else
|
||||
Var blendedState = "Press"
|
||||
EndIf
|
||||
|
||||
Function 1
|
||||
|
||||
Refresh
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Image>
|
||||
<State> showText7 </State>
|
||||
<X> 602 </X>
|
||||
<Y> 64 </Y>
|
||||
<Filename> Var( DirImage + "/text7.png" ) </Filename>
|
||||
</Image>
|
||||
|
||||
<Image>
|
||||
<State> blendedStateTxt </State>
|
||||
<X> 602 </X>
|
||||
<Y> 64 </Y>
|
||||
<Filename> Var( DirImage + "/text5.png" ) </Filename>
|
||||
</Image>
|
||||
|
||||
</Block>
|
||||
;<Block>
|
||||
;<Width> 986 </Width>
|
||||
;<Height> 160 </Height>
|
||||
;<MarginTop> 20 </MarginTop>
|
||||
;<State> blendedStateShow </State>
|
||||
;<Image>
|
||||
;<Filename> Var( DirImage + "/bg_blended.png" )</Filename>
|
||||
;</Image>
|
||||
;
|
||||
;<Button>
|
||||
;<X> 40 </X>
|
||||
;<Y> 72 </Y>
|
||||
;<State> blendedState </State>
|
||||
;<Mode> "No" </Mode>
|
||||
;<Animation>
|
||||
; <Style> "shake-text" </Style>
|
||||
; <OnEvent> "OnValueChange" </OnEvent>
|
||||
;</Animation>
|
||||
;<Filename> Var( DirImage + "/bn_blended.png" ) </Filename>
|
||||
;<FilenamePress> Var( DirImage + "/bp_blended.png" ) </FilenamePress>
|
||||
;<FilenameDisable> Var( DirImage + "/bd_blended.png" ) </FilenameDisable>
|
||||
;<FilenameForce> Var( DirImage + "/bp_blended.png" ) </FilenameForce>
|
||||
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
;<Volume> SoundVolume </Volume>
|
||||
;<EventClick>
|
||||
;
|
||||
; SAVELOG "Press Smoothies"
|
||||
;
|
||||
; If blendedState = "Press" Then
|
||||
; Var blendedState = "Enable"
|
||||
; Else
|
||||
; Var blendedState = "Press"
|
||||
; EndIf
|
||||
;
|
||||
; Function 1
|
||||
;
|
||||
; Refresh
|
||||
;</EventClick>
|
||||
;</Button>
|
||||
;
|
||||
;<Button>
|
||||
;<X> 896 </X>
|
||||
;<Y> 79 </Y>
|
||||
;<State> blendedState </State>
|
||||
;<Mode> "No" </Mode>
|
||||
;<Animation>
|
||||
; <Style> "shake-text" </Style>
|
||||
; <OnEvent> "OnValueChange" </OnEvent>
|
||||
;</Animation>
|
||||
;<Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
|
||||
;<FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
|
||||
;<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
|
||||
;<FilenameForce> Var( DirImage + "/cb_force_checked.png" ) </FilenameForce>
|
||||
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
;<Volume> SoundVolume </Volume>
|
||||
;<EventClick>
|
||||
;
|
||||
; SAVELOG "Press Smoothies"
|
||||
;
|
||||
; If blendedState = "Press" Then
|
||||
; Var blendedState = "Enable"
|
||||
; Else
|
||||
; Var blendedState = "Press"
|
||||
; EndIf
|
||||
;
|
||||
; Function 1
|
||||
;
|
||||
; Refresh
|
||||
;
|
||||
;</EventClick>
|
||||
;</Button>
|
||||
;
|
||||
;<Image>
|
||||
;<State> showText7 </State>
|
||||
;<X> 602 </X>
|
||||
;<Y> 64 </Y>
|
||||
;<Filename> Var( DirImage + "/text7.png" ) </Filename>
|
||||
;</Image>
|
||||
;
|
||||
;<Image>
|
||||
;<State> blendedStateTxt </State>
|
||||
;<X> 602 </X>
|
||||
;<Y> 64 </Y>
|
||||
;<Filename> Var( DirImage + "/text5.png" ) </Filename>
|
||||
;</Image>
|
||||
;
|
||||
;</Block>
|
||||
;
|
||||
;
|
||||
;
|
||||
|
|
@ -2524,7 +2541,7 @@
|
|||
<Height> 64 </Height>
|
||||
<State> ExtraTopping </State>
|
||||
<Image>
|
||||
<Filename> "ROOT/taobin_project/image/topping2/bg_top.png" </Filename>
|
||||
<Filename> Var( DirImage + "/bg_top.png" ) </Filename>
|
||||
</Image>
|
||||
</Row1>
|
||||
;
|
||||
|
|
@ -2553,27 +2570,16 @@
|
|||
<EventClick>
|
||||
SAVELOG "premium shot press"
|
||||
|
||||
|
||||
If ShotCoffeePremium = "Press" Then
|
||||
Var ShotCoffeePremium = "Enable"
|
||||
Var PriceDrinkTmp = PriceDrinkTmp - toppingID2price2
|
||||
Var topping2 = toppingID2index1
|
||||
Var DisableUsingCode = "false"
|
||||
SAVELOG "Deselect add premium shot"
|
||||
Else
|
||||
Var ShotCoffeePremium = "Press"
|
||||
Var PriceDrinkTmp = PriceDrinkTmp + toppingID2price2
|
||||
Var topping2 = toppingID2index2
|
||||
Var DisableUsingCode = "true"
|
||||
SAVELOG "Select add premium shot"
|
||||
EndIf
|
||||
|
||||
Var PriceDrinkNoTop = PriceDrinkTmp
|
||||
Function 2
|
||||
|
||||
Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
|
||||
|
||||
SAVELOG PriceDrinkTmp
|
||||
Refresh
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -2590,25 +2596,15 @@
|
|||
<EventClick>
|
||||
SAVELOG "premium shot press"
|
||||
|
||||
|
||||
If ShotCoffeePremium = "Press" Then
|
||||
Var ShotCoffeePremium = "Enable"
|
||||
Var PriceDrinkTmp = PriceDrinkTmp - toppingID2price2
|
||||
Var topping2 = toppingID2index1
|
||||
Var DisableUsingCode = "false"
|
||||
SAVELOG "Deselect add premium shot"
|
||||
Else
|
||||
Var ShotCoffeePremium = "Press"
|
||||
Var PriceDrinkTmp = PriceDrinkTmp + toppingID2price2
|
||||
Var topping2 = toppingID2index2
|
||||
Var DisableUsingCode = "true"
|
||||
SAVELOG "Select add premium shot"
|
||||
EndIf
|
||||
|
||||
Var PriceDrinkNoTop = PriceDrinkTmp
|
||||
Function 2
|
||||
|
||||
Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
|
||||
|
||||
SAVELOG PriceDrinkTmp
|
||||
Refresh
|
||||
|
||||
|
||||
|
|
@ -2639,7 +2635,7 @@
|
|||
<Image>
|
||||
<X> 0 </X>
|
||||
<Y> 0 </Y>
|
||||
<Filename> Var( DirImage + "/bg_top_shot2.png") </Filename>
|
||||
<Filename> Var( DirImage + "/bg_top_shot.png") </Filename>
|
||||
</Image>
|
||||
;
|
||||
<Button>
|
||||
|
|
@ -2725,7 +2721,7 @@
|
|||
<Image>
|
||||
<X> 0 </X>
|
||||
<Y> 0 </Y>
|
||||
<Filename> Var( DirImage + "/bg_top_oreo2.png") </Filename>
|
||||
<Filename> Var( DirImage + "/bg_top_oreo.png") </Filename>
|
||||
</Image>
|
||||
;
|
||||
<Button>
|
||||
|
|
@ -3590,18 +3586,16 @@
|
|||
DEBUGVAR PriceDrinkNoTop
|
||||
DEBUGVAR PriceDiff
|
||||
DEBUGVAR showShotEnable
|
||||
Var TOPPING_PRICE = 0
|
||||
|
||||
|
||||
If showShotEnable = "Press" Then
|
||||
If ShotCoffeePremium = "Press" Then
|
||||
If blendedState = "Press" Then
|
||||
Var PriceDrinkTmp = PriceDrinkNoTop
|
||||
EndIf
|
||||
|
||||
Var blendedState = "Disable"
|
||||
|
||||
Var TOPPING_PRICE = 0
|
||||
|
||||
;Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2
|
||||
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2
|
||||
|
||||
Var topping2 = toppingID2index2
|
||||
|
|
@ -3610,31 +3604,57 @@
|
|||
|
||||
Var showText7 = "Enable"
|
||||
|
||||
SAVELOG "Select add normal shot"
|
||||
SAVELOG "Select premi normal shot"
|
||||
|
||||
Else
|
||||
If blendedState = "Disable" Then
|
||||
Var blendedState = "Enable"
|
||||
|
||||
If showShotEnable = "Press" Then
|
||||
If blendedState = "Press" Then
|
||||
Var PriceDrinkTmp = PriceDrinkNoTop
|
||||
EndIf
|
||||
|
||||
Var blendedState = "Disable"
|
||||
|
||||
Var TOPPING_PRICE = 0
|
||||
|
||||
;Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2
|
||||
Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2
|
||||
|
||||
Var topping2 = toppingID2index2
|
||||
|
||||
Var DisableUsingCode = "true"
|
||||
|
||||
Var showText7 = "Enable"
|
||||
|
||||
SAVELOG "Select add normal shot"
|
||||
Else
|
||||
If blendedState = "Disable" Then
|
||||
Var blendedState = "Enable"
|
||||
EndIf
|
||||
|
||||
|
||||
Var PriceDrinkTmp = PriceDrinkNoTop
|
||||
Var topping2 = toppingID2index1
|
||||
Var DisableUsingCode = "false"
|
||||
SAVELOG "Deselect add normal shot"
|
||||
|
||||
Var showText7 = "Invisible"
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
Var PriceDrinkTmp = PriceDrinkNoTop
|
||||
Var topping2 = toppingID2index1
|
||||
Var DisableUsingCode = "false"
|
||||
SAVELOG "Deselect add normal shot"
|
||||
|
||||
Var showText7 = "Invisible"
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
DEBUGVAR showOreoAddEnable
|
||||
DEBUGVAR TOPPING_PRICE
|
||||
|
||||
If showOreoAddEnable = "Press" Then
|
||||
Var TOPPING_PRICE = TOPPING_PRICE + toppingID6price2
|
||||
Var topping6 = toppingID6index2
|
||||
Var DisableUsingCode = "true"
|
||||
Else
|
||||
Var PriceDrinkTmp = PriceDrinkNoTop
|
||||
|
||||
;Var PriceDrinkTmp = PriceDrinkNoTop
|
||||
|
||||
Var topping6 = toppingID6index1
|
||||
|
||||
|
|
@ -3646,13 +3666,15 @@
|
|||
DEBUGVAR SelectDrinkType
|
||||
|
||||
DEBUGVAR showShotEnable
|
||||
DEBUGVAR blendedState
|
||||
DEBUGVAR PriceDrinkTmpShow
|
||||
|
||||
Var PriceDrinkTmp = PriceDrinkNoTop + TOPPING_PRICE
|
||||
Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
|
||||
|
||||
If SelectDrinkType = 0 Then
|
||||
Var PriceDrinkTmpShow = "---"
|
||||
Else
|
||||
Var PriceDrinkTmpShow !assigned IntFormat( PriceDrinkTmpShow , DisplayFormat, PreScaleConvert)
|
||||
EndIf
|
||||
SAVELOG PriceDrinkTmp
|
||||
|
||||
|
|
@ -3664,6 +3686,7 @@
|
|||
|
||||
|
||||
Var Timeout = 0
|
||||
|
||||
RefreshAll
|
||||
|
||||
</Function2>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue