GBR: Changed EMA member from 8 to 6 digits
This commit is contained in:
parent
dd301dd8d5
commit
5cce644599
2 changed files with 37 additions and 26 deletions
|
|
@ -80,13 +80,13 @@
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Var Timeout = 0
|
Var Timeout = 0
|
||||||
Var EMAMemberID = EMAMemberID + "1"
|
Var EMAMemberID = EMAMemberID + "1"
|
||||||
Trim EMAMemberID 8
|
Trim EMAMemberID MAX_EMA_CODE
|
||||||
|
|
||||||
TimerReset
|
TimerReset
|
||||||
Refresh
|
Refresh
|
||||||
|
|
||||||
StrLen EMAMemberID IDNumLen
|
StrLen EMAMemberID IDNumLen
|
||||||
If IDNumLen >= 8 Then
|
If IDNumLen >= MAX_EMA_CODE Then
|
||||||
Var Tel_Confirm_State = "Enable"
|
Var Tel_Confirm_State = "Enable"
|
||||||
EndIf
|
EndIf
|
||||||
</EventClick>
|
</EventClick>
|
||||||
|
|
@ -102,13 +102,13 @@
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Var Timeout = 0
|
Var Timeout = 0
|
||||||
Var EMAMemberID = EMAMemberID + "2"
|
Var EMAMemberID = EMAMemberID + "2"
|
||||||
Trim EMAMemberID 8
|
Trim EMAMemberID MAX_EMA_CODE
|
||||||
|
|
||||||
TimerReset
|
TimerReset
|
||||||
Refresh
|
Refresh
|
||||||
|
|
||||||
StrLen EMAMemberID IDNumLen
|
StrLen EMAMemberID IDNumLen
|
||||||
If IDNumLen >= 8 Then
|
If IDNumLen >= MAX_EMA_CODE Then
|
||||||
Var Tel_Confirm_State = "Enable"
|
Var Tel_Confirm_State = "Enable"
|
||||||
EndIf
|
EndIf
|
||||||
</EventClick>
|
</EventClick>
|
||||||
|
|
@ -124,13 +124,13 @@
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Var Timeout = 0
|
Var Timeout = 0
|
||||||
Var EMAMemberID = EMAMemberID + "3"
|
Var EMAMemberID = EMAMemberID + "3"
|
||||||
Trim EMAMemberID 8
|
Trim EMAMemberID MAX_EMA_CODE
|
||||||
|
|
||||||
TimerReset
|
TimerReset
|
||||||
Refresh
|
Refresh
|
||||||
|
|
||||||
StrLen EMAMemberID IDNumLen
|
StrLen EMAMemberID IDNumLen
|
||||||
If IDNumLen >= 8 Then
|
If IDNumLen >= MAX_EMA_CODE Then
|
||||||
Var Tel_Confirm_State = "Enable"
|
Var Tel_Confirm_State = "Enable"
|
||||||
EndIf
|
EndIf
|
||||||
</EventClick>
|
</EventClick>
|
||||||
|
|
@ -146,13 +146,13 @@
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Var Timeout = 0
|
Var Timeout = 0
|
||||||
Var EMAMemberID = EMAMemberID + "4"
|
Var EMAMemberID = EMAMemberID + "4"
|
||||||
Trim EMAMemberID 8
|
Trim EMAMemberID MAX_EMA_CODE
|
||||||
|
|
||||||
TimerReset
|
TimerReset
|
||||||
Refresh
|
Refresh
|
||||||
|
|
||||||
StrLen EMAMemberID IDNumLen
|
StrLen EMAMemberID IDNumLen
|
||||||
If IDNumLen >= 8 Then
|
If IDNumLen >= MAX_EMA_CODE Then
|
||||||
Var Tel_Confirm_State = "Enable"
|
Var Tel_Confirm_State = "Enable"
|
||||||
EndIf
|
EndIf
|
||||||
</EventClick>
|
</EventClick>
|
||||||
|
|
@ -168,13 +168,13 @@
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Var Timeout = 0
|
Var Timeout = 0
|
||||||
Var EMAMemberID = EMAMemberID + "5"
|
Var EMAMemberID = EMAMemberID + "5"
|
||||||
Trim EMAMemberID 8
|
Trim EMAMemberID MAX_EMA_CODE
|
||||||
|
|
||||||
TimerReset
|
TimerReset
|
||||||
Refresh
|
Refresh
|
||||||
|
|
||||||
StrLen EMAMemberID IDNumLen
|
StrLen EMAMemberID IDNumLen
|
||||||
If IDNumLen >= 8 Then
|
If IDNumLen >= MAX_EMA_CODE Then
|
||||||
Var Tel_Confirm_State = "Enable"
|
Var Tel_Confirm_State = "Enable"
|
||||||
EndIf
|
EndIf
|
||||||
</EventClick>
|
</EventClick>
|
||||||
|
|
@ -190,13 +190,13 @@
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Var Timeout = 0
|
Var Timeout = 0
|
||||||
Var EMAMemberID = EMAMemberID + "6"
|
Var EMAMemberID = EMAMemberID + "6"
|
||||||
Trim EMAMemberID 8
|
Trim EMAMemberID MAX_EMA_CODE
|
||||||
|
|
||||||
TimerReset
|
TimerReset
|
||||||
Refresh
|
Refresh
|
||||||
|
|
||||||
StrLen EMAMemberID IDNumLen
|
StrLen EMAMemberID IDNumLen
|
||||||
If IDNumLen >= 8 Then
|
If IDNumLen >= MAX_EMA_CODE Then
|
||||||
Var Tel_Confirm_State = "Enable"
|
Var Tel_Confirm_State = "Enable"
|
||||||
EndIf
|
EndIf
|
||||||
</EventClick>
|
</EventClick>
|
||||||
|
|
@ -212,13 +212,13 @@
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Var Timeout = 0
|
Var Timeout = 0
|
||||||
Var EMAMemberID = EMAMemberID + "7"
|
Var EMAMemberID = EMAMemberID + "7"
|
||||||
Trim EMAMemberID 8
|
Trim EMAMemberID MAX_EMA_CODE
|
||||||
|
|
||||||
TimerReset
|
TimerReset
|
||||||
Refresh
|
Refresh
|
||||||
|
|
||||||
StrLen EMAMemberID IDNumLen
|
StrLen EMAMemberID IDNumLen
|
||||||
If IDNumLen >= 8 Then
|
If IDNumLen >= MAX_EMA_CODE Then
|
||||||
Var Tel_Confirm_State = "Enable"
|
Var Tel_Confirm_State = "Enable"
|
||||||
EndIf
|
EndIf
|
||||||
</EventClick>
|
</EventClick>
|
||||||
|
|
@ -234,13 +234,13 @@
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Var Timeout = 0
|
Var Timeout = 0
|
||||||
Var EMAMemberID = EMAMemberID + "8"
|
Var EMAMemberID = EMAMemberID + "8"
|
||||||
Trim EMAMemberID 8
|
Trim EMAMemberID MAX_EMA_CODE
|
||||||
|
|
||||||
TimerReset
|
TimerReset
|
||||||
Refresh
|
Refresh
|
||||||
|
|
||||||
StrLen EMAMemberID IDNumLen
|
StrLen EMAMemberID IDNumLen
|
||||||
If IDNumLen >= 8 Then
|
If IDNumLen >= MAX_EMA_CODE Then
|
||||||
Var Tel_Confirm_State = "Enable"
|
Var Tel_Confirm_State = "Enable"
|
||||||
EndIf
|
EndIf
|
||||||
</EventClick>
|
</EventClick>
|
||||||
|
|
@ -256,13 +256,13 @@
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Var Timeout = 0
|
Var Timeout = 0
|
||||||
Var EMAMemberID = EMAMemberID + "9"
|
Var EMAMemberID = EMAMemberID + "9"
|
||||||
Trim EMAMemberID 8
|
Trim EMAMemberID MAX_EMA_CODE
|
||||||
|
|
||||||
TimerReset
|
TimerReset
|
||||||
Refresh
|
Refresh
|
||||||
|
|
||||||
StrLen EMAMemberID IDNumLen
|
StrLen EMAMemberID IDNumLen
|
||||||
If IDNumLen >= 8 Then
|
If IDNumLen >= MAX_EMA_CODE Then
|
||||||
Var Tel_Confirm_State = "Enable"
|
Var Tel_Confirm_State = "Enable"
|
||||||
EndIf
|
EndIf
|
||||||
</EventClick>
|
</EventClick>
|
||||||
|
|
@ -278,13 +278,13 @@
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Var Timeout = 0
|
Var Timeout = 0
|
||||||
Var EMAMemberID = EMAMemberID + "0"
|
Var EMAMemberID = EMAMemberID + "0"
|
||||||
Trim EMAMemberID 8
|
Trim EMAMemberID MAX_EMA_CODE
|
||||||
|
|
||||||
TimerReset
|
TimerReset
|
||||||
Refresh
|
Refresh
|
||||||
|
|
||||||
StrLen EMAMemberID IDNumLen
|
StrLen EMAMemberID IDNumLen
|
||||||
If IDNumLen >= 8 Then
|
If IDNumLen >= MAX_EMA_CODE Then
|
||||||
Var Tel_Confirm_State = "Enable"
|
Var Tel_Confirm_State = "Enable"
|
||||||
EndIf
|
EndIf
|
||||||
</EventClick>
|
</EventClick>
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@
|
||||||
;EndIf
|
;EndIf
|
||||||
|
|
||||||
Var ErrorCause = ""
|
Var ErrorCause = ""
|
||||||
|
Var MAX_EMA_CODE = 6
|
||||||
|
|
||||||
Var PreScaleCanculate = 100
|
Var PreScaleCanculate = 100
|
||||||
|
|
||||||
|
|
@ -411,7 +412,7 @@
|
||||||
Else
|
Else
|
||||||
Var CameraState = "Invisible"
|
Var CameraState = "Invisible"
|
||||||
Var alphaState = "Enable"
|
Var alphaState = "Enable"
|
||||||
Var PopupCancelButtonState = "Enable"
|
Var PopupCancelButtonState = "Disable"
|
||||||
Var EMAEnterNumberButtonState = "Disable"
|
Var EMAEnterNumberButtonState = "Disable"
|
||||||
|
|
||||||
Var popup_cancel_button_y = 1390
|
Var popup_cancel_button_y = 1390
|
||||||
|
|
@ -818,9 +819,11 @@
|
||||||
|
|
||||||
Var QR_POPUP = "/img_popup8-2.png"
|
Var QR_POPUP = "/img_popup8-2.png"
|
||||||
Var EMAPopupErrorState = "Enable"
|
Var EMAPopupErrorState = "Enable"
|
||||||
|
Var PopupCancelButtonState = "Enable"
|
||||||
|
Var popup_cancel_button_y = 1225
|
||||||
|
|
||||||
Var EMAEnterNumberButtonState = "Invisible"
|
Var EMAEnterNumberButtonState = "Invisible"
|
||||||
Var LOADING_STATE = "Invisible"
|
Var LOADING_STATE = "Invisible"
|
||||||
Var popup_cancel_button_y = 1225
|
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
Else
|
Else
|
||||||
|
|
@ -1437,13 +1440,18 @@
|
||||||
|
|
||||||
<EventScanQRResult>
|
<EventScanQRResult>
|
||||||
|
|
||||||
|
SAVELOG "SCAN_QR_RESULT"
|
||||||
|
|
||||||
DEBUGVAR scanresult
|
DEBUGVAR scanresult
|
||||||
DEBUGVAR scanmsg
|
DEBUGVAR scanmsg
|
||||||
|
|
||||||
If scanresult = "true" Then
|
If scanresult = "true" Then
|
||||||
|
|
||||||
StrLen scanmsg textLen
|
StrLen scanmsg textLen
|
||||||
If textLen = 8 Then
|
|
||||||
|
DEBUGVAR textLen
|
||||||
|
|
||||||
|
If textLen = MAX_EMA_CODE Then
|
||||||
|
|
||||||
Var EMAMemberID = scanmsg
|
Var EMAMemberID = scanmsg
|
||||||
|
|
||||||
|
|
@ -1519,11 +1527,13 @@
|
||||||
EndIf
|
EndIf
|
||||||
Else
|
Else
|
||||||
Var QR_POPUP = "/img_popup8-2.png"
|
Var QR_POPUP = "/img_popup8-2.png"
|
||||||
Var EMAPopupErrorState = "Enable"
|
|
||||||
Var alphaState = "Enable"
|
Var alphaState = "Enable"
|
||||||
|
Var EMAPopupErrorState = "Enable"
|
||||||
|
Var PopupCancelButtonState = "Enable"
|
||||||
|
Var popup_cancel_button_y = 1225
|
||||||
|
|
||||||
Var LOADING_STATE = "Invisible"
|
Var LOADING_STATE = "Invisible"
|
||||||
Var EMAEnterNumberButtonState = "Invisible"
|
Var EMAEnterNumberButtonState = "Invisible"
|
||||||
Var popup_cancel_button_y = 1225
|
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
|
@ -1976,7 +1986,7 @@ EndIf
|
||||||
<State> EMAEnterNumberButtonState </State>
|
<State> EMAEnterNumberButtonState </State>
|
||||||
<Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_ema_enter_code.png" </Filename>
|
<Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_ema_enter_code.png" </Filename>
|
||||||
<FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_ema_enter_code.png" </FilenamePress>
|
<FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_ema_enter_code.png" </FilenamePress>
|
||||||
<FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_ema_enter_code.png" </FilenamePress>
|
<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_ema_enter_code.png" </FilenameDisable>
|
||||||
<EventClick>
|
<EventClick>
|
||||||
Open "ROOT/taobin_project/inter/gbr/xml/page_payment_with_ema.lxml"
|
Open "ROOT/taobin_project/inter/gbr/xml/page_payment_with_ema.lxml"
|
||||||
</EventClick>
|
</EventClick>
|
||||||
|
|
@ -2062,6 +2072,7 @@ EndIf
|
||||||
<State> PopupCancelButtonState </State>
|
<State> PopupCancelButtonState </State>
|
||||||
<Filename> Var( DirImage + "/bn_cancel.png" )</Filename>
|
<Filename> Var( DirImage + "/bn_cancel.png" )</Filename>
|
||||||
<FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
|
<FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
|
||||||
|
<FilenameDisable> Var( DirImage + "/bp_cancel.png" )</FilenameDisable>
|
||||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||||
<Volume> SoundVolume </Volume>
|
<Volume> SoundVolume </Volume>
|
||||||
<EventClick>
|
<EventClick>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue