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

selelct 8

Browse source
This commit is contained in:
wanlop run 2025-06-26 17:29:27 +07:00
commit 549ff0331a
6 changed files with 1150 additions and 1030 deletions
Download patch file Download diff file Expand all files Collapse all files

20
inter/gbr/xml/page_payment_with_ukb.lxml
View file

@ -85,7 +85,7 @@
Refresh Refresh
StrLen UKBMemberID IDNumLen StrLen UKBMemberID IDNumLen
If IDNumLen >= MAX_UKB_CODE Then If IDNumLen >= MIN_UKB_CODE Then
Var Tel_Confirm_State = "Enable" Var Tel_Confirm_State = "Enable"
EndIf EndIf
</EventClick> </EventClick>
@ -107,7 +107,7 @@
Refresh Refresh
StrLen UKBMemberID IDNumLen StrLen UKBMemberID IDNumLen
If IDNumLen >= MAX_UKB_CODE Then If IDNumLen >= MIN_UKB_CODE Then
Var Tel_Confirm_State = "Enable" Var Tel_Confirm_State = "Enable"
EndIf EndIf
</EventClick> </EventClick>
@ -129,7 +129,7 @@
Refresh Refresh
StrLen UKBMemberID IDNumLen StrLen UKBMemberID IDNumLen
If IDNumLen >= MAX_UKB_CODE Then If IDNumLen >= MIN_UKB_CODE Then
Var Tel_Confirm_State = "Enable" Var Tel_Confirm_State = "Enable"
EndIf EndIf
</EventClick> </EventClick>
@ -151,7 +151,7 @@
Refresh Refresh
StrLen UKBMemberID IDNumLen StrLen UKBMemberID IDNumLen
If IDNumLen >= MAX_UKB_CODE Then If IDNumLen >= MIN_UKB_CODE Then
Var Tel_Confirm_State = "Enable" Var Tel_Confirm_State = "Enable"
EndIf EndIf
</EventClick> </EventClick>
@ -173,7 +173,7 @@
Refresh Refresh
StrLen UKBMemberID IDNumLen StrLen UKBMemberID IDNumLen
If IDNumLen >= MAX_UKB_CODE Then If IDNumLen >= MIN_UKB_CODE Then
Var Tel_Confirm_State = "Enable" Var Tel_Confirm_State = "Enable"
EndIf EndIf
</EventClick> </EventClick>
@ -195,7 +195,7 @@
Refresh Refresh
StrLen UKBMemberID IDNumLen StrLen UKBMemberID IDNumLen
If IDNumLen >= MAX_UKB_CODE Then If IDNumLen >= MIN_UKB_CODE Then
Var Tel_Confirm_State = "Enable" Var Tel_Confirm_State = "Enable"
EndIf EndIf
</EventClick> </EventClick>
@ -217,7 +217,7 @@
Refresh Refresh
StrLen UKBMemberID IDNumLen StrLen UKBMemberID IDNumLen
If IDNumLen >= MAX_UKB_CODE Then If IDNumLen >= MIN_UKB_CODE Then
Var Tel_Confirm_State = "Enable" Var Tel_Confirm_State = "Enable"
EndIf EndIf
</EventClick> </EventClick>
@ -239,7 +239,7 @@
Refresh Refresh
StrLen UKBMemberID IDNumLen StrLen UKBMemberID IDNumLen
If IDNumLen >= MAX_UKB_CODE Then If IDNumLen >= MIN_UKB_CODE Then
Var Tel_Confirm_State = "Enable" Var Tel_Confirm_State = "Enable"
EndIf EndIf
</EventClick> </EventClick>
@ -261,7 +261,7 @@
Refresh Refresh
StrLen UKBMemberID IDNumLen StrLen UKBMemberID IDNumLen
If IDNumLen >= MAX_UKB_CODE Then If IDNumLen >= MIN_UKB_CODE Then
Var Tel_Confirm_State = "Enable" Var Tel_Confirm_State = "Enable"
EndIf EndIf
</EventClick> </EventClick>
@ -283,7 +283,7 @@
Refresh Refresh
StrLen UKBMemberID IDNumLen StrLen UKBMemberID IDNumLen
If IDNumLen >= MAX_UKB_CODE Then If IDNumLen >= MIN_UKB_CODE Then
Var Tel_Confirm_State = "Enable" Var Tel_Confirm_State = "Enable"
EndIf EndIf
</EventClick> </EventClick>

20
inter/gbr/xml/page_topping_select6.lxml
View file

@ -6741,16 +6741,16 @@
<Text> ;<Text>
<State> LidDeactiveButton </State> ;<State> LidDeactiveButton </State>
<X> 602 </X> ;<X> 602 </X>
<Y> 144 </Y> ;<Y> 144 </Y>
<Width> 290 </Width> ;<Width> 290 </Width>
<Height> 72 </Height> ;<Height> 72 </Height>
<Language> ;<Language>
<ID> 000091 </ID> ; <ID> 000091 </ID>
</Language> ;</Language>
</Text> ;</Text>

10
xml/page_payment_cash-GBR.xml
View file

@ -17,6 +17,7 @@
Var ErrorCause = "" Var ErrorCause = ""
Var MAX_UKB_CODE = 6 Var MAX_UKB_CODE = 6
Var MIN_UKB_CODE = 5
Var PreScaleCanculate = 100 Var PreScaleCanculate = 100
@ -1454,7 +1455,14 @@
DEBUGVAR textLen DEBUGVAR textLen
If textLen = MAX_UKB_CODE Then Var validTextLength = "false"
If textLen >= MIN_UKB_CODE Then
If textLen <= MAX_UKB_CODE Then
Var validTextLength = "true"
EndIf
EndIf
If validTextLength = "true" Then
Var UKBMemberID = scanmsg Var UKBMemberID = scanmsg

185
xml/page_topping_select8.xml
View file

@ -4746,7 +4746,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
Var CustomSweetState[0] = "PressForever" Var CustomSweetState[0] = "PressForever"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
Var CustomSweetState[2] = "Enable" Var CustomSweetState[2] = "Enable"
@ -4763,9 +4764,11 @@ Refresh
EndIf EndIf
Var topping1 = toppingID1index1 Var topping1 = toppingID1index1
EndIf
Var SugarZeroCalOption = "Invisible" Var SugarZeroCalOption = "Invisible"
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf
EndIf
Refresh Refresh
@ -4791,6 +4794,8 @@ Refresh
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else
If ButtonConfirmOrderState = "Disable" Then
Else Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
@ -4833,6 +4838,7 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
Refresh Refresh
@ -4856,7 +4862,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -4900,6 +4907,7 @@ Refresh
Var SugarNormalCheck = "PressForever" Var SugarNormalCheck = "PressForever"
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -4923,7 +4931,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -4983,6 +4992,7 @@ Refresh
Var SugarNormalCheck = "PressForever" Var SugarNormalCheck = "PressForever"
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -5006,7 +5016,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -5066,6 +5077,7 @@ Refresh
Var SugarNormalCheck = "PressForever" Var SugarNormalCheck = "PressForever"
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -5089,7 +5101,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -5149,6 +5162,7 @@ Refresh
Var SugarNormalCheck = "PressForever" Var SugarNormalCheck = "PressForever"
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -5159,7 +5173,7 @@ Refresh
<Text> <Text>
<X> CustomSweetNotTextX </X> <X> CustomSweetNotTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> "CustomSweetState[0]" </State> <State> CustomSweetState[0] </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5173,7 +5187,7 @@ Refresh
<Text> <Text>
<X> CustomSweetLittleTextX </X> <X> CustomSweetLittleTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> "CustomSweetState[1]" </State> <State> CustomSweetState[1] </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5187,7 +5201,7 @@ Refresh
<Text> <Text>
<X> CustomSweetLessTextX </X> <X> CustomSweetLessTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> "CustomSweetState[2]" </State> <State> CustomSweetState[2] </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5201,7 +5215,7 @@ Refresh
<Text> <Text>
<X> CustomSweetPerfectTextX </X> <X> CustomSweetPerfectTextX </X>
<Y> CustomSweetPercentTextY </Y> <Y> CustomSweetPercentTextY </Y>
<State> "CustomSweetState[3]" </State> <State> CustomSweetState[3] </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5215,7 +5229,7 @@ Refresh
<Text> <Text>
<X> CustomSweetExtraTextX </X> <X> CustomSweetExtraTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> "CustomSweetState[4]" </State> <State> CustomSweetState[4] </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5229,7 +5243,7 @@ Refresh
<Text> <Text>
<X> CustomSweetestTextX </X> <X> CustomSweetestTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> "CustomSweetState[5]" </State> <State> CustomSweetState[5] </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5447,7 +5461,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
Var CustomSweetState[0] = "PressForever" Var CustomSweetState[0] = "PressForever"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
Var CustomSweetState[2] = "Enable" Var CustomSweetState[2] = "Enable"
@ -5466,6 +5481,7 @@ Refresh
Var topping1 = toppingID1index1 Var topping1 = toppingID1index1
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf
EndIf EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -5492,7 +5508,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "PressForever" Var CustomSweetState[1] = "PressForever"
@ -5536,6 +5553,7 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -5559,7 +5577,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -5603,6 +5622,7 @@ Refresh
Var SugarNormalCheck = "PressForever" Var SugarNormalCheck = "PressForever"
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -5626,7 +5646,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -5686,6 +5707,7 @@ Refresh
Var SugarNormalCheck = "PressForever" Var SugarNormalCheck = "PressForever"
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -5709,7 +5731,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -5769,6 +5792,7 @@ Refresh
Var SugarNormalCheck = "PressForever" Var SugarNormalCheck = "PressForever"
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -5792,7 +5816,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -5852,6 +5877,7 @@ Refresh
Var SugarNormalCheck = "PressForever" Var SugarNormalCheck = "PressForever"
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -5862,7 +5888,7 @@ Refresh
<Text> <Text>
<X> CustomSweetNotTextX </X> <X> CustomSweetNotTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> "CustomSweetState[0]" </State> <State> CustomSweetState[0] </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5876,7 +5902,7 @@ Refresh
<Text> <Text>
<X> CustomSweetLittleTextX </X> <X> CustomSweetLittleTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> "CustomSweetState[1]" </State> <State> CustomSweetState[1] </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5890,7 +5916,7 @@ Refresh
<Text> <Text>
<X> CustomSweetLessTextX </X> <X> CustomSweetLessTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> "CustomSweetState[2]" </State> <State> CustomSweetState[2] </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5904,7 +5930,7 @@ Refresh
<Text> <Text>
<X> CustomSweetPerfectTextX </X> <X> CustomSweetPerfectTextX </X>
<Y> CustomSweetPercentTextY </Y> <Y> CustomSweetPercentTextY </Y>
<State> "CustomSweetState[3]" </State> <State> CustomSweetState[3] </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5918,7 +5944,7 @@ Refresh
<Text> <Text>
<X> CustomSweetExtraTextX </X> <X> CustomSweetExtraTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> "CustomSweetState[4]" </State> <State> CustomSweetState[4] </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -5932,7 +5958,7 @@ Refresh
<Text> <Text>
<X> CustomSweetestTextX </X> <X> CustomSweetestTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> "CustomSweetState[5]" </State> <State> CustomSweetState[5] </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -6000,7 +6026,8 @@ Refresh
Refresh Refresh
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "PressForever" Var CustomSweetState[0] = "PressForever"
@ -6035,6 +6062,7 @@ Refresh
TRY "ROOT/taobin_project/xml/function2.inc" TRY "ROOT/taobin_project/xml/function2.inc"
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
@ -6062,7 +6090,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "PressForever" Var CustomSweetState[1] = "PressForever"
@ -6119,6 +6148,7 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -6142,7 +6172,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -6200,6 +6231,7 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -6223,7 +6255,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -6299,6 +6332,7 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -6322,7 +6356,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -6387,6 +6422,7 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -6410,7 +6446,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -6474,6 +6511,7 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
DEBUGVAR topping1 DEBUGVAR topping1
Refresh Refresh
@ -6484,7 +6522,7 @@ Refresh
<Text> <Text>
<X> CustomSweetNotTextX </X> <X> CustomSweetNotTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> "CustomSweetState[0]" </State> <State> CustomSweetState[0] </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -6498,7 +6536,7 @@ Refresh
<Text> <Text>
<X> CustomSweetLittleTextX </X> <X> CustomSweetLittleTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> "CustomSweetState[1]" </State> <State> CustomSweetState[1] </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -6512,7 +6550,7 @@ Refresh
<Text> <Text>
<X> CustomSweetLessTextX </X> <X> CustomSweetLessTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> "CustomSweetState[2]" </State> <State> CustomSweetState[2] </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -6526,7 +6564,7 @@ Refresh
<Text> <Text>
<X> CustomSweetPerfectTextX </X> <X> CustomSweetPerfectTextX </X>
<Y> CustomSweetPercentTextY </Y> <Y> CustomSweetPercentTextY </Y>
<State> "CustomSweetState[3]" </State> <State> CustomSweetState[3] </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -6540,7 +6578,7 @@ Refresh
<Text> <Text>
<X> CustomSweetExtraTextX </X> <X> CustomSweetExtraTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> "CustomSweetState[4]" </State> <State> CustomSweetState[4] </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -6554,7 +6592,7 @@ Refresh
<Text> <Text>
<X> CustomSweetestTextX </X> <X> CustomSweetestTextX </X>
<Y> CustomSweetTextY </Y> <Y> CustomSweetTextY </Y>
<State> "CustomSweetState[5]" </State> <State> CustomSweetState[5] </State>
<Width> 250 </Width> <Width> 250 </Width>
<Height> 22 </Height> <Height> 22 </Height>
<Language> <Language>
@ -6769,6 +6807,8 @@ Refresh
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else
If ButtonConfirmOrderState = "Disable" Then
Else Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "PressForever" Var CustomSweetState[0] = "PressForever"
@ -6781,6 +6821,7 @@ Refresh
Var topping1 = toppingID1index1 Var topping1 = toppingID1index1
EndIf EndIf
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf
EndIf EndIf
@ -6808,6 +6849,8 @@ Refresh
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else
If ButtonConfirmOrderState = "Disable" Then
Else Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
@ -6823,10 +6866,11 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf
TRY "ROOT/taobin_project/xml/function2.inc" TRY "ROOT/taobin_project/xml/function2.inc"
EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>
@ -6848,7 +6892,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -6862,6 +6907,7 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
Refresh Refresh
</EventClick> </EventClick>
@ -6885,7 +6931,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
@ -6899,6 +6946,7 @@ Refresh
EndIf EndIf
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
Refresh Refresh
</EventClick> </EventClick>
@ -7278,6 +7326,8 @@ Refresh
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else
If ButtonConfirmOrderState = "Disable" Then
Else Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "PressForever" Var CustomSweetState[0] = "PressForever"
@ -7305,6 +7355,7 @@ Refresh
EndIf EndIf
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
TRY "ROOT/taobin_project/xml/function2.inc" TRY "ROOT/taobin_project/xml/function2.inc"
EndIf
EndIf EndIf
@ -7332,6 +7383,8 @@ Refresh
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else
If ButtonConfirmOrderState = "Disable" Then
Else Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
@ -7360,6 +7413,7 @@ Refresh
;Var UserSeletedSugar = 1 ;Var UserSeletedSugar = 1
EndIf EndIf
EndIf
Refresh Refresh
</EventClick> </EventClick>
@ -7382,7 +7436,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -7409,6 +7464,7 @@ Refresh
;Var UserSeletedSugar = 1 ;Var UserSeletedSugar = 1
EndIf EndIf
EndIf
Refresh Refresh
</EventClick> </EventClick>
@ -7432,7 +7488,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
@ -7459,6 +7516,7 @@ Refresh
EndIf EndIf
;Var UserSeletedSugar = 1 ;Var UserSeletedSugar = 1
EndIf EndIf
EndIf
Refresh Refresh
</EventClick> </EventClick>
@ -7607,7 +7665,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
Var CustomSweetState[0] = "PressForever" Var CustomSweetState[0] = "PressForever"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
Var CustomSweetState[2] = "Enable" Var CustomSweetState[2] = "Enable"
@ -7616,8 +7675,10 @@ Refresh
Var CustomSweetState[5] = "Enable" Var CustomSweetState[5] = "Enable"
Var topping1 = toppingID1index1 Var topping1 = toppingID1index1
EndIf
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf
EndIf
Refresh Refresh
@ -7643,6 +7704,8 @@ Refresh
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else
If ButtonConfirmOrderState = "Disable" Then
Else Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
@ -7664,9 +7727,11 @@ Refresh
EndIf EndIf
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf
TRY "ROOT/taobin_project/xml/function2.inc" TRY "ROOT/taobin_project/xml/function2.inc"
EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>
@ -7687,7 +7752,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -7711,6 +7777,7 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
Refresh Refresh
</EventClick> </EventClick>
@ -7734,7 +7801,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
@ -7764,6 +7832,7 @@ Refresh
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf EndIf
EndIf
Refresh Refresh
@ -7916,7 +7985,8 @@ Refresh
Refresh Refresh
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "PressForever" Var CustomSweetState[0] = "PressForever"
@ -7946,6 +8016,7 @@ Refresh
TRY "ROOT/taobin_project/xml/function2.inc" TRY "ROOT/taobin_project/xml/function2.inc"
EndIf EndIf
EndIf
</EventClick> </EventClick>
@ -7970,6 +8041,8 @@ Refresh
If SelectDrinkType = 0 Then If SelectDrinkType = 0 Then
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else
If ButtonConfirmOrderState = "Disable" Then
Else Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
@ -8005,9 +8078,11 @@ Refresh
EndIf EndIf
EndIf EndIf
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
EndIf
TRY "ROOT/taobin_project/xml/function2.inc" TRY "ROOT/taobin_project/xml/function2.inc"
EndIf
EndIf
</EventClick> </EventClick>
</Button> </Button>
@ -8028,7 +8103,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
Var CustomSweetState[1] = "Enable" Var CustomSweetState[1] = "Enable"
@ -8063,6 +8139,7 @@ Refresh
EndIf EndIf
;Var UserSeletedSugar = 1 ;Var UserSeletedSugar = 1
EndIf EndIf
EndIf
Refresh Refresh
</EventClick> </EventClick>
@ -8086,7 +8163,8 @@ Refresh
SAVELOG "drink type popup" SAVELOG "drink type popup"
Var high_light_drink_type = "Enable" Var high_light_drink_type = "Enable"
Else Else
If ButtonConfirmOrderState = "Disable" Then
Else
If ShiftSugarStep = 1 Then If ShiftSugarStep = 1 Then
Var CustomSweetState[0] = "Enable" Var CustomSweetState[0] = "Enable"
@ -8129,6 +8207,7 @@ Refresh
EndIf EndIf
;Var UserSeletedSugar = 1 ;Var UserSeletedSugar = 1
EndIf EndIf
EndIf
Refresh Refresh
@ -10707,7 +10786,7 @@ Refresh
<Width> 700 </Width> <Width> 700 </Width>
<Height> 72 </Height> <Height> 72 </Height>
<Language> <Language>
<ID> 000102 </ID> <ID> 002027 </ID>
</Language> </Language>
</Text> </Text>
@ -10730,7 +10809,7 @@ Refresh
Var ShotCoffeePremium = "Press" Var ShotCoffeePremium = "Press"
EndIf EndIf
Function 2 TRY "ROOT/taobin_project/xml/function2.inc"
Refresh Refresh
</EventClick> </EventClick>
@ -10756,7 +10835,7 @@ Refresh
Var ShotCoffeePremium = "Press" Var ShotCoffeePremium = "Press"
EndIf EndIf
Function 2 TRY "ROOT/taobin_project/xml/function2.inc"
Refresh Refresh

3
xml/vending_info.xml
View file

@ -187,7 +187,8 @@
DEBUGVAR FrontDoorVersionInt DEBUGVAR FrontDoorVersionInt
If FrontDoorVersionInt > 2000 Then ; front_more_than_20000
If FrontDoorVersionInt > 19999 Then
Var EnableTestRGB = "Enable" Var EnableTestRGB = "Enable"
Else Else
Var EnableTestRGB = "Invisible" Var EnableTestRGB = "Invisible"

90
xml/vending_info2.xml
View file

@ -183,6 +183,21 @@
Var sleepmodeEnable = "false" Var sleepmodeEnable = "false"
Var AlphaState = "Invisible"
If NewUiBSM = "" Then
Var NewUiBSM = "Offline"
EndIf
If EnableBrewIPC = "" Then
Var EnableBrewIPC = "false"
EndIf
If EnableBrewIPC = "true" Then
StartBrewNewUiLoginService
EndIf
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
@ -190,11 +205,35 @@
DEBUGVAR Timeout DEBUGVAR Timeout
DEBUGVAR WhileRetryCounter DEBUGVAR WhileRetryCounter
DEBUGVAR NewUiBSM
If WaitPopup = "Enable" Then
Var AlphaState = "Enable"
Else
If FailPopup = "Enable" Then
Var AlphaState = "Enable"
EndIf
EndIf
If AlphaState = "Enable" Then
If Timeout > 10 Then
Var AlphaState = "Invisible"
Var alphaPasswordPromptWithKeyboard = "Invisible"
Var PassPhrase = ""
Var HiddenPassPhrase = ""
EndIf
EndIf
If alphaPasswordPromptWithKeyboard = "Enable" Then If alphaPasswordPromptWithKeyboard = "Enable" Then
If AlphaState = "Enable" Then
SAVELOG "Wait for password v2"
Var Timeout = Timeout + 1
Else
Var Timeout = 0 Var Timeout = 0
EndIf
Else Else
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
EndIf EndIf
@ -217,6 +256,8 @@
Var alphaPasswordPromptWithKeyboard = "Invisible" Var alphaPasswordPromptWithKeyboard = "Invisible"
Var alphaPasswordPrompt = "Invisible" Var alphaPasswordPrompt = "Invisible"
Var AlphaState = "Invisible"
Var tmpPassPhrase = PassPhrase Var tmpPassPhrase = PassPhrase
DEBUGVAR tmpPassPhrase DEBUGVAR tmpPassPhrase
@ -508,24 +549,24 @@
<Value> SignalStrengthLevel </Value> <Value> SignalStrengthLevel </Value>
</Text> </Text>
<Button> ;<Button>
<X> 300 </X> ;<X> 300 </X>
<Y> 480 </Y> ;<Y> 480 </Y>
<Filename> "ROOT/taobin_project/image/new_vending_info/QuickTest.png" </Filename> ;<Filename> "ROOT/taobin_project/image/new_vending_info/QuickTest.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/new_vending_info/QuickTest.png" </FilenamePress> ;<FilenamePress> "ROOT/taobin_project/image/new_vending_info/QuickTest.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>
;
DEBUGVAR ShowVersionAll ; DEBUGVAR ShowVersionAll
;
If alphaPasswordPromptWithKeyboard = "Invisible" Then ; If alphaPasswordPromptWithKeyboard = "Invisible" Then
Var alphaPasswordPromptWithKeyboard = "Enable" ; Var alphaPasswordPromptWithKeyboard = "Enable"
Var ClickOn = "QuickTest" ; Var ClickOn = "QuickTest"
EndIf ; EndIf
;
</EventClick> ;</EventClick>
</Button> ;</Button>
<Button> <Button>
<X> 550 </X> <X> 550 </X>
@ -966,6 +1007,7 @@
If EnableBrewIPC = "true" Then If EnableBrewIPC = "true" Then
; Direct-call-to-brew ; Direct-call-to-brew
LoginBrew PassPhrase LoginBrew PassPhrase
Var AlphaState = "Enable"
Else Else
; CallCMDFromXML ; CallCMDFromXML
__CMD "check-password" PassPhrase "-" "-" __CMD "check-password" PassPhrase "-" "-"
@ -1012,17 +1054,7 @@
<Image> <Image>
<X> 0 </X> <X> 0 </X>
<Y> 0 </Y> <Y> 0 </Y>
<State> eval( <State> AlphaState </State>
If WaitPopup = "Enable" Then
Var return = "Enable"
Else
If FailPopup = "Enable" Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
EndIf
) </State>
<Filename> "ROOT/taobin_project/image/new_vending_info/alpha.png" </Filename> <Filename> "ROOT/taobin_project/image/new_vending_info/alpha.png" </Filename>
</Image> </Image>