diff --git a/inter/gbr/xml/page_payment_with_ema.lxml b/inter/gbr/xml/page_payment_with_ema.lxml
index 19371239..c379188f 100644
--- a/inter/gbr/xml/page_payment_with_ema.lxml
+++ b/inter/gbr/xml/page_payment_with_ema.lxml
@@ -80,13 +80,13 @@
Var Timeout = 0
Var EMAMemberID = EMAMemberID + "1"
- Trim EMAMemberID 8
+ Trim EMAMemberID MAX_EMA_CODE
TimerReset
Refresh
StrLen EMAMemberID IDNumLen
- If IDNumLen >= 8 Then
+ If IDNumLen >= MAX_EMA_CODE Then
Var Tel_Confirm_State = "Enable"
EndIf
@@ -102,13 +102,13 @@
Var Timeout = 0
Var EMAMemberID = EMAMemberID + "2"
- Trim EMAMemberID 8
+ Trim EMAMemberID MAX_EMA_CODE
TimerReset
Refresh
StrLen EMAMemberID IDNumLen
- If IDNumLen >= 8 Then
+ If IDNumLen >= MAX_EMA_CODE Then
Var Tel_Confirm_State = "Enable"
EndIf
@@ -124,13 +124,13 @@
Var Timeout = 0
Var EMAMemberID = EMAMemberID + "3"
- Trim EMAMemberID 8
+ Trim EMAMemberID MAX_EMA_CODE
TimerReset
Refresh
StrLen EMAMemberID IDNumLen
- If IDNumLen >= 8 Then
+ If IDNumLen >= MAX_EMA_CODE Then
Var Tel_Confirm_State = "Enable"
EndIf
@@ -146,13 +146,13 @@
Var Timeout = 0
Var EMAMemberID = EMAMemberID + "4"
- Trim EMAMemberID 8
+ Trim EMAMemberID MAX_EMA_CODE
TimerReset
Refresh
StrLen EMAMemberID IDNumLen
- If IDNumLen >= 8 Then
+ If IDNumLen >= MAX_EMA_CODE Then
Var Tel_Confirm_State = "Enable"
EndIf
@@ -168,13 +168,13 @@
Var Timeout = 0
Var EMAMemberID = EMAMemberID + "5"
- Trim EMAMemberID 8
+ Trim EMAMemberID MAX_EMA_CODE
TimerReset
Refresh
StrLen EMAMemberID IDNumLen
- If IDNumLen >= 8 Then
+ If IDNumLen >= MAX_EMA_CODE Then
Var Tel_Confirm_State = "Enable"
EndIf
@@ -190,13 +190,13 @@
Var Timeout = 0
Var EMAMemberID = EMAMemberID + "6"
- Trim EMAMemberID 8
+ Trim EMAMemberID MAX_EMA_CODE
TimerReset
Refresh
StrLen EMAMemberID IDNumLen
- If IDNumLen >= 8 Then
+ If IDNumLen >= MAX_EMA_CODE Then
Var Tel_Confirm_State = "Enable"
EndIf
@@ -212,13 +212,13 @@
Var Timeout = 0
Var EMAMemberID = EMAMemberID + "7"
- Trim EMAMemberID 8
+ Trim EMAMemberID MAX_EMA_CODE
TimerReset
Refresh
StrLen EMAMemberID IDNumLen
- If IDNumLen >= 8 Then
+ If IDNumLen >= MAX_EMA_CODE Then
Var Tel_Confirm_State = "Enable"
EndIf
@@ -234,13 +234,13 @@
Var Timeout = 0
Var EMAMemberID = EMAMemberID + "8"
- Trim EMAMemberID 8
+ Trim EMAMemberID MAX_EMA_CODE
TimerReset
Refresh
StrLen EMAMemberID IDNumLen
- If IDNumLen >= 8 Then
+ If IDNumLen >= MAX_EMA_CODE Then
Var Tel_Confirm_State = "Enable"
EndIf
@@ -256,13 +256,13 @@
Var Timeout = 0
Var EMAMemberID = EMAMemberID + "9"
- Trim EMAMemberID 8
+ Trim EMAMemberID MAX_EMA_CODE
TimerReset
Refresh
StrLen EMAMemberID IDNumLen
- If IDNumLen >= 8 Then
+ If IDNumLen >= MAX_EMA_CODE Then
Var Tel_Confirm_State = "Enable"
EndIf
@@ -278,13 +278,13 @@
Var Timeout = 0
Var EMAMemberID = EMAMemberID + "0"
- Trim EMAMemberID 8
+ Trim EMAMemberID MAX_EMA_CODE
TimerReset
Refresh
StrLen EMAMemberID IDNumLen
- If IDNumLen >= 8 Then
+ If IDNumLen >= MAX_EMA_CODE Then
Var Tel_Confirm_State = "Enable"
EndIf
diff --git a/xml/page_payment_cash-GBR.xml b/xml/page_payment_cash-GBR.xml
index a0fe50f2..fa2d7e85 100644
--- a/xml/page_payment_cash-GBR.xml
+++ b/xml/page_payment_cash-GBR.xml
@@ -16,6 +16,7 @@
;EndIf
Var ErrorCause = ""
+ Var MAX_EMA_CODE = 6
Var PreScaleCanculate = 100
@@ -411,7 +412,7 @@
Else
Var CameraState = "Invisible"
Var alphaState = "Enable"
- Var PopupCancelButtonState = "Enable"
+ Var PopupCancelButtonState = "Disable"
Var EMAEnterNumberButtonState = "Disable"
Var popup_cancel_button_y = 1390
@@ -818,9 +819,11 @@
Var QR_POPUP = "/img_popup8-2.png"
Var EMAPopupErrorState = "Enable"
+ Var PopupCancelButtonState = "Enable"
+ Var popup_cancel_button_y = 1225
+
Var EMAEnterNumberButtonState = "Invisible"
Var LOADING_STATE = "Invisible"
- Var popup_cancel_button_y = 1225
EndIf
EndIf
Else
@@ -1437,13 +1440,18 @@
+ SAVELOG "SCAN_QR_RESULT"
+
DEBUGVAR scanresult
DEBUGVAR scanmsg
If scanresult = "true" Then
StrLen scanmsg textLen
- If textLen = 8 Then
+
+ DEBUGVAR textLen
+
+ If textLen = MAX_EMA_CODE Then
Var EMAMemberID = scanmsg
@@ -1519,11 +1527,13 @@
EndIf
Else
Var QR_POPUP = "/img_popup8-2.png"
- Var EMAPopupErrorState = "Enable"
Var alphaState = "Enable"
+ Var EMAPopupErrorState = "Enable"
+ Var PopupCancelButtonState = "Enable"
+ Var popup_cancel_button_y = 1225
+
Var LOADING_STATE = "Invisible"
Var EMAEnterNumberButtonState = "Invisible"
- Var popup_cancel_button_y = 1225
EndIf
EndIf
@@ -1976,7 +1986,7 @@ EndIf
EMAEnterNumberButtonState
"ROOT/taobin_project/inter/gbr/image/payment_cash/bn_ema_enter_code.png"
"ROOT/taobin_project/inter/gbr/image/payment_cash/bp_ema_enter_code.png"
- "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_ema_enter_code.png"
+ "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_ema_enter_code.png"
Open "ROOT/taobin_project/inter/gbr/xml/page_payment_with_ema.lxml"
@@ -2062,6 +2072,7 @@ EndIf
PopupCancelButtonState
Var( DirImage + "/bn_cancel.png" )
Var( DirImage + "/bp_cancel.png" )
+ Var( DirImage + "/bp_cancel.png" )
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume