selelct 8
This commit is contained in:
commit
549ff0331a
6 changed files with 1150 additions and 1030 deletions
|
|
@ -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>
|
||||||
|
|
|
||||||
|
|
@ -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>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -15,7 +15,7 @@
|
||||||
DEBUGVAR GetFreeFromError
|
DEBUGVAR GetFreeFromError
|
||||||
DEBUGVAR FailErrorHappend
|
DEBUGVAR FailErrorHappend
|
||||||
|
|
||||||
|
|
||||||
Var info_startX = 11
|
Var info_startX = 11
|
||||||
Var info_1Y = 250
|
Var info_1Y = 250
|
||||||
Var info_2Y = 320
|
Var info_2Y = 320
|
||||||
|
|
@ -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"
|
||||||
|
|
@ -339,7 +340,7 @@
|
||||||
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
|
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
|
||||||
<EventClick>
|
<EventClick>
|
||||||
If CountTouchButton = 4 Then
|
If CountTouchButton = 4 Then
|
||||||
|
|
||||||
Var TimeOutSmoothiesProcess = 181
|
Var TimeOutSmoothiesProcess = 181
|
||||||
Var SelectDrink = "12-00-07-0000"
|
Var SelectDrink = "12-00-07-0000"
|
||||||
Var Seeker.selected_a_drink = SelectDrink
|
Var Seeker.selected_a_drink = SelectDrink
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
Var Timeout = 0
|
|
||||||
|
If AlphaState = "Enable" Then
|
||||||
|
SAVELOG "Wait for password v2"
|
||||||
|
Var Timeout = Timeout + 1
|
||||||
|
Else
|
||||||
|
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>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue