Add ERR and popup
This commit is contained in:
kong
parent
01a523d214
commit
8b72015e2f
28 changed files with 5162 additions and 622 deletions
|
|
@ -16,13 +16,19 @@
|
|||
|
||||
DEBUGVAR SelectDrink
|
||||
DEBUGVAR PictureDrink
|
||||
|
||||
If new_layout = "true" Then
|
||||
|
||||
If SelectDrinkLen = 0 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
EndIf
|
||||
Else
|
||||
If SelectDrinkLen = 0 Then
|
||||
SAVELOG "SelectDrinkLen=0"
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
EndIf
|
||||
|
||||
If PriceDrink = 0 Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
If PriceDrink = 0 Then
|
||||
SAVELOG "PriceDrink=0"
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var SaveProductCodeSelect = SelectDrink
|
||||
|
|
@ -99,11 +105,6 @@
|
|||
|
||||
EndIf
|
||||
|
||||
If new_layout = "true" Then
|
||||
Var showname = ""
|
||||
Var showdesc = ""
|
||||
EndIf
|
||||
|
||||
Var bg_strawlid = DirImage + "/bg_strawlid.png"
|
||||
Var bg_straw_only = DirImage + "/bg_straw_only.png"
|
||||
Var bg_lid_only = DirImage + "/bg_lid_only.png"
|
||||
|
|
@ -176,9 +177,14 @@
|
|||
|
||||
Var NEW_MULTI = "Invisible"
|
||||
|
||||
|
||||
Var high_light_drink_type = "Invisible"
|
||||
|
||||
Var text_hot_color = "0x84776F"
|
||||
Var text_cold_color = "0x84776F"
|
||||
Var text_blender_color = "0x84776F"
|
||||
|
||||
If new_layout = "true" Then
|
||||
Var PriceDrinkTmpShow = "---"
|
||||
|
||||
Var show_select_type = "Enable"
|
||||
|
||||
|
|
@ -205,6 +211,9 @@
|
|||
|
||||
Else
|
||||
Var show_select_type = "Invisible"
|
||||
|
||||
; assume auto select
|
||||
Var SelectDrinkType = 1
|
||||
EndIf
|
||||
|
||||
DEBUGVAR show_select_type
|
||||
|
|
@ -252,8 +261,7 @@
|
|||
Var img_smth_dis2 = "/bt_smoothie_disable2_no.png"
|
||||
|
||||
|
||||
|
||||
|
||||
Var topping_price_refresh = 1
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
|
@ -297,6 +305,17 @@
|
|||
TimerReset
|
||||
</EventTimeout>
|
||||
|
||||
<Image>
|
||||
<X> 0 </X>
|
||||
<Y> 380 </Y>
|
||||
<Width> 1080 </Width>
|
||||
<Height> 1540 </Height>
|
||||
<Color> "0xeae6e1" </Color>
|
||||
</Image>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<Button>
|
||||
<X> 990 </X>
|
||||
|
|
@ -372,15 +391,6 @@
|
|||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Image>
|
||||
<X> 0 </X>
|
||||
<Y> 380 </Y>
|
||||
<Width> 1080 </Width>
|
||||
<Height> 1540 </Height>
|
||||
<Color> "0xeae6e1" </Color>
|
||||
</Image>
|
||||
|
||||
|
||||
|
||||
;<Video>
|
||||
;<X> 0 </X>
|
||||
|
|
@ -780,106 +790,111 @@
|
|||
|
||||
Var collagenShow = "true"
|
||||
;-BEGIN shot layout
|
||||
|
||||
If topping_price_refresh = 1 Then
|
||||
Var topping_price_refresh = 0
|
||||
|
||||
Var topping3 = toppingID3Default
|
||||
Var shot_h_layout = 218
|
||||
Var topping3 = toppingID3Default
|
||||
Var shot_h_layout = 218
|
||||
|
||||
If TOPPING2 = "shot coffee" Then
|
||||
|
||||
Var ShotCoffeeBG = "Enable"
|
||||
Var showShotEnable = "Enable"
|
||||
If TOPPING2 = "shot coffee" Then
|
||||
|
||||
Var ShotCoffeeBG = "Enable"
|
||||
Var showShotEnable = "Enable"
|
||||
|
||||
|
||||
Refresh
|
||||
EndIf
|
||||
|
||||
|
||||
Refresh
|
||||
EndIf
|
||||
|
||||
If TOPPING2 = "shot coffee termtem" Then
|
||||
|
||||
If TOPPING2 = "shot coffee termtem" Then
|
||||
|
||||
Var ShotCoffeeBG = "Enable"
|
||||
Var showShotEnable = "Enable"
|
||||
Var ShotCoffeeBG = "Enable"
|
||||
Var showShotEnable = "Enable"
|
||||
|
||||
DEBUGVAR TOPPING2
|
||||
Refresh
|
||||
EndIf
|
||||
DEBUGVAR TOPPING2
|
||||
Refresh
|
||||
EndIf
|
||||
|
||||
If TOPPING2 = "shot coffee 1003" Then
|
||||
|
||||
Var ShotCoffeePremium = "Enable"
|
||||
Var showShotEnable = "Enable"
|
||||
|
||||
DEBUGVAR TOPPING2
|
||||
Refresh
|
||||
EndIf
|
||||
If TOPPING2 = "shot coffee 1007" Then
|
||||
|
||||
Var ShotCoffeePremium = "Enable"
|
||||
Var showShotEnable = "Enable"
|
||||
|
||||
DEBUGVAR TOPPING2
|
||||
Refresh
|
||||
EndIf
|
||||
If TOPPING2 = "shot coffee 1008" Then
|
||||
|
||||
Var ShotCoffeePremium = "Enable"
|
||||
Var showShotEnable = "Enable"
|
||||
|
||||
DEBUGVAR TOPPING2
|
||||
Refresh
|
||||
EndIf
|
||||
|
||||
If TOPPING2 = "add-show-1009" Then
|
||||
|
||||
Var ShotCoffeePremium = "Enable"
|
||||
Var showShotEnable = "Enable"
|
||||
|
||||
DEBUGVAR TOPPING2
|
||||
Refresh
|
||||
EndIf
|
||||
If TOPPING2 = "add-show-1101" Then
|
||||
|
||||
Var ShotCoffeePremium = "Enable"
|
||||
Var showShotEnable = "Enable"
|
||||
|
||||
DEBUGVAR TOPPING2
|
||||
Refresh
|
||||
EndIf
|
||||
|
||||
If TOPPING2 = "add-show-1102" Then
|
||||
|
||||
Var ShotCoffeePremium = "Enable"
|
||||
Var showShotEnable = "Enable"
|
||||
|
||||
DEBUGVAR TOPPING2
|
||||
Refresh
|
||||
EndIf
|
||||
If TOPPING2 = "shot coffee 1003" Then
|
||||
|
||||
If TOPPING2 = "add-show-1103" Then
|
||||
|
||||
Var ShotCoffeePremium = "Enable"
|
||||
Var showShotEnable = "Enable"
|
||||
Var ShotCoffeePremium = "Enable"
|
||||
Var showShotEnable = "Enable"
|
||||
|
||||
DEBUGVAR TOPPING2
|
||||
Refresh
|
||||
EndIf
|
||||
If TOPPING2 = "add-show-1104" Then
|
||||
|
||||
Var ShotCoffeePremium = "Enable"
|
||||
Var showShotEnable = "Enable"
|
||||
|
||||
DEBUGVAR TOPPING2
|
||||
Refresh
|
||||
EndIf
|
||||
DEBUGVAR TOPPING2
|
||||
Refresh
|
||||
EndIf
|
||||
If TOPPING2 = "shot coffee 1007" Then
|
||||
|
||||
Var ShotCoffeePremium = "Enable"
|
||||
Var showShotEnable = "Enable"
|
||||
|
||||
;-END
|
||||
If TOPPING3 = "Collagen" Then
|
||||
Var CollagenState = "Enable"
|
||||
Else
|
||||
Var CollagenState = "Invisible"
|
||||
Var ShowCollagenOnly = "Invisible"
|
||||
EndIf
|
||||
DEBUGVAR TOPPING2
|
||||
Refresh
|
||||
EndIf
|
||||
If TOPPING2 = "shot coffee 1008" Then
|
||||
|
||||
Var ShotCoffeePremium = "Enable"
|
||||
Var showShotEnable = "Enable"
|
||||
|
||||
DEBUGVAR TOPPING2
|
||||
Refresh
|
||||
EndIf
|
||||
|
||||
If TOPPING2 = "add-show-1009" Then
|
||||
|
||||
Var ShotCoffeePremium = "Enable"
|
||||
Var showShotEnable = "Enable"
|
||||
|
||||
DEBUGVAR TOPPING2
|
||||
Refresh
|
||||
EndIf
|
||||
If TOPPING2 = "add-show-1101" Then
|
||||
|
||||
Var ShotCoffeePremium = "Enable"
|
||||
Var showShotEnable = "Enable"
|
||||
|
||||
DEBUGVAR TOPPING2
|
||||
Refresh
|
||||
EndIf
|
||||
|
||||
If TOPPING2 = "add-show-1102" Then
|
||||
|
||||
Var ShotCoffeePremium = "Enable"
|
||||
Var showShotEnable = "Enable"
|
||||
|
||||
DEBUGVAR TOPPING2
|
||||
Refresh
|
||||
EndIf
|
||||
|
||||
If TOPPING2 = "add-show-1103" Then
|
||||
|
||||
Var ShotCoffeePremium = "Enable"
|
||||
Var showShotEnable = "Enable"
|
||||
|
||||
DEBUGVAR TOPPING2
|
||||
Refresh
|
||||
EndIf
|
||||
If TOPPING2 = "add-show-1104" Then
|
||||
|
||||
Var ShotCoffeePremium = "Enable"
|
||||
Var showShotEnable = "Enable"
|
||||
|
||||
DEBUGVAR TOPPING2
|
||||
Refresh
|
||||
EndIf
|
||||
|
||||
|
||||
;-END
|
||||
If TOPPING3 = "Collagen" Then
|
||||
Var CollagenState = "Enable"
|
||||
Else
|
||||
Var CollagenState = "Invisible"
|
||||
Var ShowCollagenOnly = "Invisible"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
;topping_price_refresh = 0
|
||||
|
||||
|
||||
SAVELOG ToppingGotoPayment
|
||||
|
|
@ -1015,8 +1030,8 @@
|
|||
<Block>
|
||||
|
||||
; show_select_type
|
||||
<Width> 986 </Width>
|
||||
<Height> 160 </Height>
|
||||
<Width> 988 </Width>
|
||||
<Height> 162 </Height>
|
||||
<MarginTop> 20 </MarginTop>
|
||||
<State> show_select_type </State>
|
||||
|
||||
|
|
@ -1053,8 +1068,6 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
DEBUGVAR blend_button_state
|
||||
|
||||
If blend_button_state = "Disable" Then
|
||||
|
||||
Else
|
||||
|
|
@ -1065,9 +1078,15 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
DEBUGVAR cold_button_state
|
||||
DEBUGVAR blend_button_state
|
||||
|
||||
Var BugFlag = 0
|
||||
Var topping_price_refresh = 0
|
||||
Topping "Load" PD_CODE1
|
||||
|
||||
Var high_light_drink_type = "Invisible"
|
||||
|
||||
Function 2
|
||||
|
||||
Refresh
|
||||
|
|
@ -1117,6 +1136,7 @@
|
|||
EndIf
|
||||
|
||||
Var BugFlag = 0
|
||||
Var topping_price_refresh = 0
|
||||
Topping "Load" PD_CODE2
|
||||
|
||||
Function 2
|
||||
|
|
@ -1166,6 +1186,7 @@
|
|||
EndIf
|
||||
|
||||
Var BugFlag = 0
|
||||
Var topping_price_refresh = 0
|
||||
Topping "Load" PD_CODE3
|
||||
|
||||
Function 2
|
||||
|
|
@ -2017,6 +2038,8 @@
|
|||
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
DEBUGVAR PriceDrinkTmp
|
||||
|
||||
;Var Seeker.PriceDrink = PriceDrinkTmp
|
||||
|
|
@ -2097,8 +2120,14 @@
|
|||
Var Seeker.showname = showname
|
||||
|
||||
If CART_COUNT = 0 Then
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
|
||||
Open "ROOT/taobin_project/xml/page_payment.xml"
|
||||
If SelectDrinkType = 1 Then
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
|
||||
Open "ROOT/taobin_project/xml/page_payment.xml"
|
||||
EndIf
|
||||
|
||||
If SelectDrinkType = 0 Then
|
||||
Var high_light_drink_type = "Enable"
|
||||
EndIf
|
||||
Else
|
||||
|
||||
If CART1_STATUS = "EMPTY" Then
|
||||
|
|
@ -2279,7 +2308,23 @@
|
|||
DEBUGVAR menu_name_thai_cold
|
||||
SAVELOG "FUNCTION2"
|
||||
Var TOPPING_PRICE = 0
|
||||
|
||||
Var SelectDrinkType = 0
|
||||
|
||||
; Set default
|
||||
If SelectCountDrinkType = 1 Then
|
||||
If DefaultDrinkType = 1 Then
|
||||
Var hot_button_state = "PressForever"
|
||||
EndIf
|
||||
If DefaultDrinkType = 2 Then
|
||||
Var cold_button_state = "PressForever"
|
||||
EndIf
|
||||
If DefaultDrinkType = 3 Then
|
||||
Var blend_button_state = "PressForever"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
If hot_button_state = "PressForever" Then
|
||||
Var PriceDrinkNoTop = PriceD1
|
||||
Var UserSelectProductCode = PD_CODE1
|
||||
|
|
@ -2301,6 +2346,8 @@
|
|||
Var text_cold_color = "0x84776F"
|
||||
Var text_blender_color = "0x84776F"
|
||||
|
||||
Var SelectDrinkType = 1
|
||||
|
||||
EndIf
|
||||
|
||||
If cold_button_state = "PressForever" Then
|
||||
|
|
@ -2324,6 +2371,8 @@
|
|||
Var text_cold_color = "0xFFFFFF"
|
||||
Var text_blender_color = "0x84776F"
|
||||
|
||||
Var SelectDrinkType = 1
|
||||
|
||||
EndIf
|
||||
|
||||
If blend_button_state = "PressForever" Then
|
||||
|
|
@ -2345,6 +2394,8 @@
|
|||
Var text_cold_color = "0x84776F"
|
||||
Var text_blender_color = "0xFFFFFF"
|
||||
|
||||
Var SelectDrinkType = 1
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -2386,7 +2437,7 @@
|
|||
|
||||
EndIf
|
||||
|
||||
|
||||
DEBUGVAR SelectDrinkType
|
||||
|
||||
DEBUGVAR showShotEnable
|
||||
DEBUGVAR blendedState
|
||||
|
|
@ -2394,6 +2445,9 @@
|
|||
Var PriceDrinkTmp = PriceDrinkNoTop + TOPPING_PRICE
|
||||
Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
|
||||
|
||||
If SelectDrinkType = 0 Then
|
||||
Var PriceDrinkTmpShow = "---"
|
||||
EndIf
|
||||
SAVELOG PriceDrinkTmp
|
||||
|
||||
CRLFToSpace showname
|
||||
|
|
@ -2408,6 +2462,7 @@
|
|||
</Function2>
|
||||
|
||||
|
||||
|
||||
<Text>
|
||||
<X> 924 </X>
|
||||
<Y> 1804 </Y>
|
||||
|
|
@ -2421,4 +2476,131 @@
|
|||
</Animation>
|
||||
<Value> PriceDrinkTmpShow </Value>
|
||||
</Text>
|
||||
|
||||
<Image>
|
||||
<X> 0 </X>
|
||||
<Y> 380 </Y>
|
||||
<Width> 1080 </Width>
|
||||
<Height> 1540 </Height>
|
||||
<State> high_light_drink_type </State>
|
||||
<Filename> "ROOT/taobin_project/image/topping2_en/topping_en/high_light_drink_type.png"</Filename>
|
||||
</Image>
|
||||
|
||||
<Button>
|
||||
<X> 508 </X>
|
||||
<Y> 953 </Y>
|
||||
<State> eval(
|
||||
Var return = "Invisible"
|
||||
If high_light_drink_type = "Enable" Then
|
||||
If hot_button_state = "Enable" Then
|
||||
Var return = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
)
|
||||
</Stage>
|
||||
<Width> 160 </Width>
|
||||
<Height> 56 </Height>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
SAVELOG "Press hot"
|
||||
|
||||
Var hot_button_state = "PressForever"
|
||||
|
||||
Var BugFlag = 0
|
||||
Var topping_price_refresh = 0
|
||||
Topping "Load" PD_CODE1
|
||||
|
||||
Var high_light_drink_type = "Invisible"
|
||||
|
||||
Function 2
|
||||
|
||||
Refresh
|
||||
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
<Button>
|
||||
<X> 666 </X>
|
||||
<Y> 953 </Y>
|
||||
<State> eval(
|
||||
Var return = "Invisible"
|
||||
If high_light_drink_type = "Enable" Then
|
||||
If cold_button_state = "Enable" Then
|
||||
Var return = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
) </Stage>
|
||||
<Width> 160 </Width>
|
||||
<Height> 56 </Height>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
Var cold_button_state = "PressForever"
|
||||
|
||||
SAVELOG "Press cold - on high-light"
|
||||
Var high_light_drink_type = "Invisible"
|
||||
|
||||
Var BugFlag = 0
|
||||
Var topping_price_refresh = 0
|
||||
Topping "Load" PD_CODE2
|
||||
|
||||
Function 2
|
||||
|
||||
Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
<Button>
|
||||
<X> 824 </X>
|
||||
<Y> 953 </Y>
|
||||
<State> eval(
|
||||
Var return = "Invisible"
|
||||
If high_light_drink_type = "Enable" Then
|
||||
If blend_button_state = "Enable" Then
|
||||
Var return = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
) </Stage>
|
||||
<Width> 160 </Width>
|
||||
<Height> 56 </Height>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
SAVELOG "Press blend"
|
||||
|
||||
Var blend_button_state = "PressForever"
|
||||
Var high_light_drink_type = "Invisible"
|
||||
|
||||
|
||||
Var BugFlag = 0
|
||||
Var topping_price_refresh = 0
|
||||
Topping "Load" PD_CODE3
|
||||
|
||||
Function 2
|
||||
|
||||
Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
<Text>
|
||||
<X> 543 </X>
|
||||
<Y> 920 </Y>
|
||||
<State> high_light_drink_type </State>
|
||||
<Font> KanitTTF </Font>
|
||||
<Size> 36 </Size>
|
||||
<Width> 1080 </Width>
|
||||
<Color> 0xFF0000 </Color>
|
||||
<Value> eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "Please choose drink type"
|
||||
Else
|
||||
Var return ="โปรดเลือกประเภทเครื่องดื่ม"
|
||||
EndIf
|
||||
)</Value>
|
||||
</Text>
|
||||
|
||||
;
|
||||
|
||||
</Page>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue