fix bug topping 5
This commit is contained in:
parent
b8299ecb3d
commit
9645f3afff
2 changed files with 45 additions and 17 deletions
4
video/sync_1.file
Normal file
4
video/sync_1.file
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
total 12400
|
||||||
|
-rw-rw---- 1 root sdcard_rw 8679952 2022-09-28 02:41 main_page_event_alter.mp4
|
||||||
|
-rw-rw---- 1 root sdcard_rw 0 2021-11-01 15:13 sync_1.file
|
||||||
|
-rw-rw---- 1 root sdcard_rw 3999239 2022-09-27 02:04 taobin_thank1_event_alter.mp4
|
||||||
|
|
@ -423,9 +423,7 @@
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
If new_layout = "true" Then
|
Function 2
|
||||||
Function 2
|
|
||||||
EndIf
|
|
||||||
|
|
||||||
|
|
||||||
RefreshAll
|
RefreshAll
|
||||||
|
|
@ -550,7 +548,19 @@
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
DEBUGVAR SubMenuGroupIDSlot6_1
|
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
|
If blend_button_state = "PressForever" Then
|
||||||
|
|
||||||
Else
|
Else
|
||||||
|
|
@ -665,7 +675,6 @@
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
If UserSeletedSugar = 0 Then
|
If UserSeletedSugar = 0 Then
|
||||||
If SugarModeUpdateWhenChangeDrinkType = 1 Then
|
If SugarModeUpdateWhenChangeDrinkType = 1 Then
|
||||||
Var SugarModeUpdateWhenChangeDrinkType = 0
|
Var SugarModeUpdateWhenChangeDrinkType = 0
|
||||||
|
|
@ -819,6 +828,8 @@
|
||||||
Var SugarState4 = "Enable"
|
Var SugarState4 = "Enable"
|
||||||
Var SugarState5 = "Enable"
|
Var SugarState5 = "Enable"
|
||||||
|
|
||||||
|
DEBUGVAR "set default Powder Sugar"
|
||||||
|
|
||||||
If toppingID1index1 = toppingID1Default Then
|
If toppingID1index1 = toppingID1Default Then
|
||||||
Var SugarState1 = "PressForever"
|
Var SugarState1 = "PressForever"
|
||||||
Var sugar_default_flag = 1
|
Var sugar_default_flag = 1
|
||||||
|
|
@ -847,6 +858,9 @@
|
||||||
If sugar_default_flag = 0 Then
|
If sugar_default_flag = 0 Then
|
||||||
Var SugarState1 = "PressForever"
|
Var SugarState1 = "PressForever"
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
DEBUGVAR toppingID1Default
|
||||||
|
DEBUGVAR SugarState1
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -986,6 +1000,8 @@
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
DEBUGVAR SelectDrinkType
|
||||||
|
|
||||||
If SelectDrinkType = 0 Then
|
If SelectDrinkType = 0 Then
|
||||||
Var SugarState1 = "Enable"
|
Var SugarState1 = "Enable"
|
||||||
Var SugarState2 = "Enable"
|
Var SugarState2 = "Enable"
|
||||||
|
|
@ -1150,9 +1166,10 @@
|
||||||
DEBUGVAR showShotEnable
|
DEBUGVAR showShotEnable
|
||||||
DEBUGVAR showOreoAddEnable
|
DEBUGVAR showOreoAddEnable
|
||||||
DEBUGVAR ShotCoffeePremium
|
DEBUGVAR ShotCoffeePremium
|
||||||
SAVELOG toppingID2price1
|
DEBUGVAR toppingID2price1
|
||||||
SAVELOG toppingID2price2
|
DEBUGVAR toppingID2price2
|
||||||
SAVELOG toppingID2price3
|
DEBUGVAR toppingID2price3
|
||||||
|
Function 2
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1281,6 +1298,7 @@
|
||||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||||
<Volume> SoundVolume </Volume>
|
<Volume> SoundVolume </Volume>
|
||||||
<EventClick>
|
<EventClick>
|
||||||
|
Var SelectDrinkType = 1
|
||||||
|
|
||||||
SAVELOG "Press hot"
|
SAVELOG "Press hot"
|
||||||
|
|
||||||
|
|
@ -1314,9 +1332,9 @@
|
||||||
|
|
||||||
Var high_light_drink_type = "Invisible"
|
Var high_light_drink_type = "Invisible"
|
||||||
|
|
||||||
Function 2
|
;Function 2
|
||||||
|
|
||||||
Refresh
|
;Refresh
|
||||||
|
|
||||||
|
|
||||||
</EventClick>
|
</EventClick>
|
||||||
|
|
@ -1337,6 +1355,7 @@
|
||||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||||
<Volume> SoundVolume </Volume>
|
<Volume> SoundVolume </Volume>
|
||||||
<EventClick>
|
<EventClick>
|
||||||
|
Var SelectDrinkType = 1
|
||||||
|
|
||||||
SAVELOG "Press cold"
|
SAVELOG "Press cold"
|
||||||
|
|
||||||
|
|
@ -1366,9 +1385,9 @@
|
||||||
Var topping_price_refresh = 0
|
Var topping_price_refresh = 0
|
||||||
Topping "Load" PD_CODE2
|
Topping "Load" PD_CODE2
|
||||||
|
|
||||||
Function 2
|
;Function 2
|
||||||
|
|
||||||
Refresh
|
;Refresh
|
||||||
</EventClick>
|
</EventClick>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
|
|
@ -1389,6 +1408,7 @@
|
||||||
<EventClick>
|
<EventClick>
|
||||||
|
|
||||||
SAVELOG "Press blend"
|
SAVELOG "Press blend"
|
||||||
|
Var SelectDrinkType = 1
|
||||||
|
|
||||||
Var blend_button_state = "PressForever"
|
Var blend_button_state = "PressForever"
|
||||||
|
|
||||||
|
|
@ -1416,9 +1436,9 @@
|
||||||
Var topping_price_refresh = 0
|
Var topping_price_refresh = 0
|
||||||
Topping "Load" PD_CODE3
|
Topping "Load" PD_CODE3
|
||||||
|
|
||||||
Function 2
|
;Function 2
|
||||||
|
|
||||||
Refresh
|
;Refresh
|
||||||
</EventClick>
|
</EventClick>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
|
|
@ -3569,7 +3589,8 @@
|
||||||
DEBUGVAR PriceDrinkNoTop
|
DEBUGVAR PriceDrinkNoTop
|
||||||
DEBUGVAR PriceDiff
|
DEBUGVAR PriceDiff
|
||||||
DEBUGVAR showShotEnable
|
DEBUGVAR showShotEnable
|
||||||
|
Var TOPPING_PRICE = 0
|
||||||
|
|
||||||
If ShotCoffeePremium = "Press" Then
|
If ShotCoffeePremium = "Press" Then
|
||||||
If blendedState = "Press" Then
|
If blendedState = "Press" Then
|
||||||
Var PriceDrinkTmp = PriceDrinkNoTop
|
Var PriceDrinkTmp = PriceDrinkNoTop
|
||||||
|
|
@ -3586,7 +3607,7 @@
|
||||||
|
|
||||||
Var showText7 = "Enable"
|
Var showText7 = "Enable"
|
||||||
|
|
||||||
SAVELOG "Select add normal shot"
|
SAVELOG "Select premi normal shot"
|
||||||
|
|
||||||
Else
|
Else
|
||||||
|
|
||||||
|
|
@ -3628,13 +3649,15 @@
|
||||||
|
|
||||||
|
|
||||||
DEBUGVAR showOreoAddEnable
|
DEBUGVAR showOreoAddEnable
|
||||||
|
DEBUGVAR TOPPING_PRICE
|
||||||
|
|
||||||
If showOreoAddEnable = "Press" Then
|
If showOreoAddEnable = "Press" Then
|
||||||
Var TOPPING_PRICE = TOPPING_PRICE + toppingID6price2
|
Var TOPPING_PRICE = TOPPING_PRICE + toppingID6price2
|
||||||
Var topping6 = toppingID6index2
|
Var topping6 = toppingID6index2
|
||||||
Var DisableUsingCode = "true"
|
Var DisableUsingCode = "true"
|
||||||
Else
|
Else
|
||||||
Var PriceDrinkTmp = PriceDrinkNoTop
|
|
||||||
|
;Var PriceDrinkTmp = PriceDrinkNoTop
|
||||||
|
|
||||||
Var topping6 = toppingID6index1
|
Var topping6 = toppingID6index1
|
||||||
|
|
||||||
|
|
@ -3664,6 +3687,7 @@
|
||||||
|
|
||||||
|
|
||||||
Var Timeout = 0
|
Var Timeout = 0
|
||||||
|
|
||||||
RefreshAll
|
RefreshAll
|
||||||
|
|
||||||
</Function2>
|
</Function2>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue