This commit is contained in:
kong 2023-01-16 14:57:11 +07:00
parent af13f3b021
commit d69a176f3c
22 changed files with 911 additions and 7001 deletions

View file

@ -28,24 +28,9 @@
DEBUGVAR SelectDrink
DEBUGVAR PictureDrink
DEBUGVAR new_layout
If new_layout = "true" Then
Else
If SelectDrinkLen = 0 Then
SAVELOG "SelectDrinkLen=0"
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
If PriceDrink = 0 Then
SAVELOG "PriceDrink=0"
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
EndIf
Var SaveProductCodeSelect = SelectDrink
Var UserSelectProductCode = SelectDrink
Var SaveProductCodeSelect = "-"
Var UserSelectProductCode = "-"
Var showText4 = "Invisible"
Var showText7 = "Invisible"
@ -618,32 +603,7 @@
Var h_block_of_sugar = 210
;STRCONTAIN "Smoothie" SubMenuName11 HaveSmoothie
STRCONTAIN "Smoothie" MenuCodeName HaveSmoothie
If show_select_type = "Invisible" Then
If HaveSmoothie = "true" Then
Var blendedState = "Enable"
Var blendedStateShow = "Enable"
Var PriceDiff = SubMenuPrice1 - PriceDrinkNoTop
DEBUGVAR IsSmoRet
If IsSmoRet = "true" Then
Var blendedState = "ForceSet"
Var blendedStateTxt = "Enable"
Topping "LoadSubMenu" SubMenuProductCode1
Function 1
Else
Var blendedStateTxt = "Invisible"
EndIf
EndIf
Else
Var blendedStateShow = "Invisible"
EndIf
If IgnoreLidStraw = "true" Then
Var IgnoreLidStraw = "false"
Var ShowLidStraw = "Invisible"
@ -1561,95 +1521,6 @@
</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>
;
;
;
;
@ -3220,12 +3091,6 @@
;Var Seeker = "curr"
If new_layout = "true" Then
; Name , Descript
EndIf
DEBUGVAR PriceDrinkTmp
@ -3323,7 +3188,6 @@
DEBUGVAR LidState
DEBUGVAR StrawState
DEBUGVAR UserSelectProductCode
; DEBUGVAR HAVE_UV_DOOR_LID obsolete.
If StrawState = "Press" Then
@ -3347,13 +3211,8 @@
EndIf
;
If RoadShow = "true" Then
Var SelectDrink = UserSelectProductCode
Else
Var SelectDrink = UserSelectProductCode
EndIf
Var SelectDrink = UserSelectProductCode
Var Seeker.selected_a_drink = UserSelectProductCode
DEBUGVAR Seeker.selected_a_drink
@ -3408,9 +3267,13 @@
GetLongTimeInMinute LastTimeClickOrder
If CART_COUNT = 0 Then
If SelectDrinkType = 1 Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
If UserSelectProductCode = "-" Then
Else
If SelectDrinkType = 1 Then
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
EndIf
If SelectDrinkType = 0 Then
@ -3443,102 +3306,6 @@
</Button>
<Function1>
SAVELOG "FUNCTION1"
Var TOPPING_PRICE = 0
DEBUGVAR PriceDrinkNoTop
DEBUGVAR PriceDiff
DEBUGVAR showShotEnable
DEBUGVAR blendedState
If blendedState = "ForceSet" Then
Var TOPPING_PRICE = PriceDiff
Var UserSelectProductCode = SubMenuProductCode1
If showShotEnable = "Invisible" Then
Else
Var showShotEnable = "Disable"
EndIf
Var showText4 = "Enable"
Else
If blendedState = "Press" Then
Var TOPPING_PRICE = PriceDiff
Var UserSelectProductCode = SubMenuProductCode1
If showShotEnable = "Invisible" Then
Else
Var showShotEnable = "Disable"
EndIf
Var showText4 = "Enable"
Else
Var UserSelectProductCode = SaveProductCodeSelect
If showShotEnable = "Disable" Then
Var showShotEnable = "Enable"
EndIf
Var showText4 = "Invisible"
EndIf
EndIf
If RoadShow = "true" Then
Var PriceDrinkTmp = "Free"
Var SaveSelectDrinkRoadShow = UserSelectProductCode
EndIf
DEBUGVAR UserSelectProductCode
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
DEBUGVAR showShotEnable
DEBUGVAR blendedState
Var PriceDrinkTmp = PriceDrinkNoTop + TOPPING_PRICE
Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
SAVELOG PriceDrinkTmp
Var Timeout = 0
</Function1>
<Function2>