Merge branch 'master' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project
This commit is contained in:
kong
commit
bf4833b558
59 changed files with 2149 additions and 109 deletions
|
|
@ -11,6 +11,10 @@
|
|||
READ_FILE "/mnt/sdcard/coffeevending/cash_disable" cash_disable
|
||||
DEBUGVAR cash_disable
|
||||
|
||||
;If AdultFlag = 1 Then
|
||||
; Open "ROOT/taobin_project/xml/page_payment_camera.xml"
|
||||
;EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -47,7 +51,6 @@
|
|||
Var AdultFlag2 = 1
|
||||
EndIf
|
||||
|
||||
|
||||
Var ReqPayInfoFlag2 = 0
|
||||
|
||||
|
||||
|
|
@ -226,7 +229,7 @@
|
|||
|
||||
EndIf
|
||||
|
||||
Var X_CASH = 60
|
||||
Var X_CASH = 184
|
||||
|
||||
If RoadShow = "true" Then
|
||||
Var X_CASH = 287
|
||||
|
|
@ -528,6 +531,19 @@
|
|||
|
||||
__CMD "prepar-cup-from-order" 0 "-" "-"
|
||||
|
||||
If ReqPayInfoFromCashOther = 1 Then
|
||||
Var LOADING_STATE = "Enable"
|
||||
|
||||
Var FlagQROpened = 1
|
||||
Var alphaState = "Enable"
|
||||
|
||||
VendingQR ON
|
||||
|
||||
Var ReqPayInfoFromCashOther = 0
|
||||
EndIf
|
||||
|
||||
;Open "ROOT/taobin_project/xml/page_page_camera.xml"
|
||||
|
||||
</EventOpen>
|
||||
|
||||
<EventActionOk>
|
||||
|
|
@ -567,6 +583,9 @@
|
|||
If ReqPayInfoFlag2 = 3 Then
|
||||
Var Seeker.CampaignPayChanel = "true"
|
||||
EndIf
|
||||
If ReqPayInfoFlag2 = 4 Then
|
||||
Var Seeker.CampaignPayChanel = "dolfin"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
|
@ -646,6 +665,25 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
If ReqPayInfoFlag = 4 Then
|
||||
If VendingQRTypeResult = "DOL:2" Then
|
||||
Var CashTextWarning = ""
|
||||
Var QRErrorState = "Invisible"
|
||||
Var QRCODE99Shoppy = SessionID
|
||||
Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a
|
||||
SAVELOG Ext1a
|
||||
SAVELOG QRCODE99Shoppy
|
||||
Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21
|
||||
Var ReqPayInfoFlag = 0
|
||||
Var ReqPayInfoFlag2 = 4
|
||||
SAVELOG QRCODE99Shoppy
|
||||
SAVELOG Ext21
|
||||
|
||||
Var QRCODE99 = QRCODE99Shoppy
|
||||
Var LOADING_STATE = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Else
|
||||
Var PayInfoCFlag = 1
|
||||
EndIf
|
||||
|
|
@ -676,6 +714,13 @@
|
|||
Var LOADING_STATE = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
If ReqPayInfoFlag = 4 Then
|
||||
Var QRErrorFlag = 1
|
||||
If alphaState = "Enable" Then
|
||||
Var QRErrorState = "Enable"
|
||||
Var LOADING_STATE = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
Var PayInfoCFlag = 1
|
||||
EndIf
|
||||
|
|
@ -694,6 +739,16 @@
|
|||
EndIf
|
||||
|
||||
|
||||
If CamFlag = 1 Then
|
||||
Var CamCount = CamCount + 1
|
||||
If CamCount > 2 Then
|
||||
facecompare 10
|
||||
Var CamFlag = 0
|
||||
Var CamCount = 0
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If AdultState2 = "Enable" Then
|
||||
Var countAdultS2 = countAdultS2 + 1
|
||||
|
|
@ -976,113 +1031,119 @@
|
|||
DEBUGVAR IDCardData
|
||||
DEBUGVAR IDBirthdate
|
||||
|
||||
If AdultFlag2 = 1 Then
|
||||
If CancelFlag = 0 Then
|
||||
|
||||
If IDCardStatus = "OK" Then
|
||||
If IDCardReady = "OK" Then
|
||||
If IDCardData = "START" Then
|
||||
If AdultFlag2 = 1 Then
|
||||
|
||||
Var AdultState2 = "Enable"
|
||||
Var AdultState1 = "Invisible"
|
||||
|
||||
Refresh
|
||||
If IDCardStatus = "OK" Then
|
||||
If IDCardReady = "OK" Then
|
||||
If IDCardData = "START" Then
|
||||
|
||||
Var AdultState2 = "Enable"
|
||||
Var AdultState1 = "Invisible"
|
||||
Var AdultState3 = "Invisible"
|
||||
|
||||
Refresh
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If IDCardStatus = "OK" Then
|
||||
If IDCardReady = "OK" Then
|
||||
If IDCardData = "ERROR" Then
|
||||
Var AdultState2 = "Invisible"
|
||||
Var AdultState3 = "Enable"
|
||||
|
||||
Refresh
|
||||
If IDCardStatus = "OK" Then
|
||||
If IDCardReady = "OK" Then
|
||||
If IDCardData = "ERROR" Then
|
||||
Var AdultState2 = "Invisible"
|
||||
Var AdultState3 = "Enable"
|
||||
|
||||
Refresh
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If IDCardStatus = "ERROR" Then
|
||||
Var AdultState2 = "Invisible"
|
||||
Var AdultState3 = "Enable"
|
||||
|
||||
Refresh
|
||||
EndIf
|
||||
If IDCardStatus = "ERROR" Then
|
||||
Var AdultState2 = "Invisible"
|
||||
Var AdultState3 = "Enable"
|
||||
|
||||
Refresh
|
||||
EndIf
|
||||
|
||||
If IDCardStatus = "OK" Then
|
||||
If IDCardReady = "OK" Then
|
||||
If IDCardData = "DONE" Then
|
||||
If IDCardStatus = "OK" Then
|
||||
If IDCardReady = "OK" Then
|
||||
If IDCardData = "DONE" Then
|
||||
|
||||
;Var birthDate = IDBirthdate
|
||||
Var StrYear = ""
|
||||
Var StrMon = ""
|
||||
Var StrDay = ""
|
||||
;Var birthDate = IDBirthdate
|
||||
Var StrYear = ""
|
||||
Var StrMon = ""
|
||||
Var StrDay = ""
|
||||
|
||||
SUBSTRING IDBirthdate 0 4 StrYear
|
||||
SUBSTRING IDBirthdate 4 6 StrMon
|
||||
SUBSTRING IDBirthdate 6 8 StrDay
|
||||
SUBSTRING IDBirthdate 0 4 StrYear
|
||||
SUBSTRING IDBirthdate 4 6 StrMon
|
||||
SUBSTRING IDBirthdate 6 8 StrDay
|
||||
|
||||
INT StrYear
|
||||
INT StrMon
|
||||
INT StrDay
|
||||
INT StrYear
|
||||
INT StrMon
|
||||
INT StrDay
|
||||
|
||||
Var Adult20 = 0
|
||||
Var Adult20 = 0
|
||||
|
||||
|
||||
DEBUGVAR StrYear
|
||||
DEBUGVAR StrMon
|
||||
DEBUGVAR StrDay
|
||||
DEBUGVAR StrYear
|
||||
DEBUGVAR StrMon
|
||||
DEBUGVAR StrDay
|
||||
|
||||
DEBUGVAR sdatemonth
|
||||
DEBUGVAR sdateday
|
||||
DEBUGVAR sdatemonth
|
||||
DEBUGVAR sdateday
|
||||
|
||||
Var sdateyear = sdateyear + 543
|
||||
Var AgeNumber = sdateyear - StrYear
|
||||
DEBUGVAR AgeNumber
|
||||
Var sdateyear = sdateyear + 543
|
||||
Var AgeNumber = sdateyear - StrYear
|
||||
DEBUGVAR AgeNumber
|
||||
|
||||
If AgeNumber >= 20 Then
|
||||
If AgeNumber >= 20 Then
|
||||
|
||||
If AgeNumber = 20 Then
|
||||
If sdatemonth > StrMon Then
|
||||
Var Adult20 = 1
|
||||
Else
|
||||
If sdatemonth = StrMon Then
|
||||
If sdateday >= StrDay Then
|
||||
Var Adult20 = 1
|
||||
If AgeNumber = 20 Then
|
||||
If sdatemonth > StrMon Then
|
||||
Var Adult20 = 1
|
||||
Else
|
||||
If sdatemonth = StrMon Then
|
||||
If sdateday >= StrDay Then
|
||||
Var Adult20 = 1
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
Var Adult20 = 1
|
||||
EndIf
|
||||
|
||||
If Adult20 = 1 Then
|
||||
Var AdultState3 = "Invisible"
|
||||
Var AdultState2 = "Invisible"
|
||||
Var AdultState1 = "Invisible"
|
||||
Var AdultState = "Invisible"
|
||||
;CoinVending XBILL
|
||||
Open "ROOT/taobin_project/xml/page_payment_camera.xml"
|
||||
Refresh
|
||||
|
||||
Else
|
||||
Var AdultState2 = "Invisible"
|
||||
Var AdultState3 = "Enable"
|
||||
Refresh
|
||||
EndIf
|
||||
|
||||
Else
|
||||
Var Adult20 = 1
|
||||
Var AdultState2 = "Invisible"
|
||||
Var AdultState3 = "Enable"
|
||||
Refresh
|
||||
EndIf
|
||||
|
||||
If Adult20 = 1 Then
|
||||
Var AdultState3 = "Invisible"
|
||||
Var AdultState2 = "Invisible"
|
||||
Var AdultState1 = "Invisible"
|
||||
Var AdultState = "Invisible"
|
||||
CoinVending XBILL
|
||||
Refresh
|
||||
|
||||
Else
|
||||
Var AdultState2 = "Invisible"
|
||||
Var AdultState3 = "Enable"
|
||||
Refresh
|
||||
EndIf
|
||||
|
||||
Else
|
||||
Var AdultState2 = "Invisible"
|
||||
Var AdultState3 = "Enable"
|
||||
Refresh
|
||||
Var AdultFlag2 = 1
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
Var AdultFlag2 = 1
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -1334,8 +1395,8 @@
|
|||
</Button>
|
||||
|
||||
<Button>
|
||||
<X> 804 </X>
|
||||
<Y> 1255</Y>
|
||||
<X> 184 </X>
|
||||
<Y> 1503</Y>
|
||||
<State> PayState2</State>
|
||||
<Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
|
||||
|
|
@ -1359,7 +1420,7 @@
|
|||
</Button>
|
||||
|
||||
<Button>
|
||||
<X> 308 </X>
|
||||
<X> 432 </X>
|
||||
<Y> 1255 </Y>
|
||||
<State> PayState3</State>
|
||||
<Filename> Var( DirImage + "/bn_prompt_pay.png") </Filename>
|
||||
|
|
@ -1443,7 +1504,7 @@
|
|||
;If CoinAmount > 0 Then
|
||||
; Change CoinAmount
|
||||
; Var ChangeOK = 0
|
||||
; Var CancelFlag = 1
|
||||
; Var CancelFlag = 1x
|
||||
; Var CancelCounter = 0
|
||||
; Var NoGotoMenupage = "true"
|
||||
;
|
||||
|
|
@ -1465,7 +1526,7 @@
|
|||
</Button>
|
||||
|
||||
<Button>
|
||||
<X> 556 </X>
|
||||
<X> 680 </X>
|
||||
<Y> 1255 </Y>
|
||||
<State> PayState4</State>
|
||||
<Filename> Var( DirImage + "/bn_pay_with_credit.png") </Filename>
|
||||
|
|
@ -1492,10 +1553,36 @@
|
|||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
||||
<Button>
|
||||
<X> 432 </X>
|
||||
<Y> 1503 </Y>
|
||||
<State> PayState5</State>
|
||||
<Filename> Var( DirImage + "/bn_pay_with_ewallet.png") </Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_pay_with_ewallet.png") </FilenamePress>
|
||||
<FilenameDisable> Var( DirImage + "/bp_pay_with_ewallet.png") </FilenameDisable>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
|
||||
If alphaState = "Invisible" Then
|
||||
|
||||
If CoinInFlag = 0 Then
|
||||
If CancelFlag = 0 Then
|
||||
Open "ROOT/taobin_project/xml/page_payment_cashOther.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Button>
|
||||
<X> 418 </X>
|
||||
<Y> 1503 </Y>
|
||||
<State> PayState5</State>
|
||||
<State> "Invisible" </State>
|
||||
<Filename> Var( DirImage + "/bn_pay_with_shoppy.png") </Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_pay_with_shoppy.png") </FilenamePress>
|
||||
<FilenameDisable> Var( DirImage + "/bp_pay_with_shoppy.png") </FilenameDisable>
|
||||
|
|
@ -1575,7 +1662,7 @@
|
|||
<Button>
|
||||
<X> 170 </X>
|
||||
<Y> 1503 </Y>
|
||||
<State> PayState6</State>
|
||||
<State> "Invisible" </State>
|
||||
<Filename> Var( DirImage + "/bn_pay_with_true.png") </Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_pay_with_true.png") </FilenamePress>
|
||||
<FilenameDisable> Var( DirImage + "/bp_pay_with_true.png") </FilenameDisable>
|
||||
|
|
@ -1665,7 +1752,7 @@
|
|||
</Button>
|
||||
|
||||
<Button>
|
||||
<X> 666 </X>
|
||||
<X> 680 </X>
|
||||
<Y> 1503 </Y>
|
||||
<State> PayState2</State>
|
||||
<Filename> Var( DirImage + "/bn_pay_with_codeOther.png") </Filename>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue