Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
e2dc4b423d
22 changed files with 26533 additions and 2847 deletions
|
|
@ -1534,94 +1534,182 @@ EndIf
|
|||
</Button>
|
||||
|
||||
|
||||
<Button>
|
||||
<X> 328 </X>
|
||||
<Y> 1499 </Y>
|
||||
<State> PayState3</State>
|
||||
<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_pay_qrcode.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bp_pay_qrcode.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/payment_cash/bd_pay_qrcode.png" </FilenameDisable>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
;<Button>
|
||||
;<X> 216 </X>
|
||||
;<Y> 1499 </Y>
|
||||
;<State> PayState3</State>
|
||||
;<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_pay_qrcode.png" </Filename>
|
||||
;<FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bp_pay_qrcode.png" </FilenamePress>
|
||||
;<FilenameDisable> "ROOT/taobin_project/inter/aus/image/payment_cash/bd_pay_qrcode.png" </FilenameDisable>
|
||||
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
;<Volume> SoundVolume </Volume>
|
||||
;<EventClick>
|
||||
;
|
||||
; If Timeout < 120 Then
|
||||
; If CoinInFlag = 0 Then
|
||||
; If CancelFlag = 0 Then
|
||||
; If alphaState = "Invisible" Then
|
||||
;
|
||||
; Var QR_POPUP = "/img_popup1.png"
|
||||
; Var QRCODE99 = ""
|
||||
;
|
||||
; Var LOADING_STATE = "Enable"
|
||||
;
|
||||
; Var FlagQROpened = 1
|
||||
; Var alphaState = "Enable"
|
||||
;
|
||||
; VendingQR ON
|
||||
;
|
||||
; Var SessionID2 = SelectSlot + ":"
|
||||
; Var SessionID2 = SessionID2 + Seeker.ExtendData
|
||||
;
|
||||
; Var CreditAmount1 = ""
|
||||
; Var ServiceAmountFlow = ""
|
||||
; Var TelephoneNumberQR = "0899999999"
|
||||
; Var ServiceType = "coffee"
|
||||
; Var ECommerceQR = ""
|
||||
; Var ECommerceQR = ECommerceQR + PriceDrink
|
||||
; Var ECommerceQR = ECommerceQR + "/"
|
||||
; Var ECommerceQR = ECommerceQR + DiscountDrink
|
||||
; Var ECommerceQR = ECommerceQR + "/"
|
||||
; Var ECommerceQR = ECommerceQR + SessionID2
|
||||
; Var ECommerceQR = ECommerceQR + "/"
|
||||
; Var ECommerceQR = ECommerceQR + SelectDrink
|
||||
; Var ECommerceQR = ECommerceQR + "/"
|
||||
; Var ECommerceQR = ECommerceQR + "FZB:2/"
|
||||
;
|
||||
; If Seeker.IntVendingCampaign > 0 Then
|
||||
; Var ECommerceQR = ECommerceQR + Seeker.VendingCode
|
||||
; Var ECommerceQR = ECommerceQR + ":"
|
||||
; Var ECommerceQR = ECommerceQR + Seeker.CodeNumber
|
||||
; Var ECommerceQR = ECommerceQR + ":"
|
||||
; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3
|
||||
; EndIf
|
||||
;
|
||||
; If Seeker.IntVendingCredit > 0 Then
|
||||
; If Seeker.IntVendingCampaign > 0 Then
|
||||
; Var ECommerceQR = ECommerceQR + "|"
|
||||
; EndIf
|
||||
; Var ECommerceQR = ECommerceQR + "CRD"
|
||||
; Var ECommerceQR = ECommerceQR + ":"
|
||||
; Var ECommerceQR = ECommerceQR + Seeker.TNumberTaobinCredit
|
||||
; Var ECommerceQR = ECommerceQR + ":"
|
||||
; Var ECommerceQR = ECommerceQR + Seeker.IntVendingCredit
|
||||
; Var ECommerceQR = ECommerceQR + ":"
|
||||
; Var ECommerceQR = ECommerceQR + PointCrm
|
||||
; EndIf
|
||||
;
|
||||
;
|
||||
; Var ServiceParameter = "max"
|
||||
; Var ServiceCharge = 0
|
||||
; Var AccountType = "new"
|
||||
; Var testservice = "kbank"
|
||||
; Var tc = ""
|
||||
; Var GetScore = ""
|
||||
; Var OperatorName = ""
|
||||
; Var SessionID = ""
|
||||
;
|
||||
; Var PayDetail2 = Seeker.PayDetail2
|
||||
; GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
|
||||
; Var ReqPayInfoFlag = 1
|
||||
; Refresh
|
||||
; EndIf
|
||||
; EndIf
|
||||
; EndIf
|
||||
; EndIf
|
||||
;
|
||||
;
|
||||
;</EventClick>
|
||||
;</Button>
|
||||
If Timeout < 120 Then
|
||||
If CoinInFlag = 0 Then
|
||||
If CancelFlag = 0 Then
|
||||
If alphaState = "Invisible" Then
|
||||
|
||||
Var QR_POPUP = "/img_popup1.png"
|
||||
Var QRCODE99 = ""
|
||||
|
||||
Var LOADING_STATE = "Enable"
|
||||
|
||||
Var FlagQROpened = 1
|
||||
Var alphaState = "Enable"
|
||||
|
||||
VendingQR ON
|
||||
|
||||
Var SessionID2 = SelectSlot + ":"
|
||||
Var SessionID2 = SessionID2 + Seeker.ExtendData
|
||||
|
||||
Var CreditAmount1 = ""
|
||||
Var ServiceAmountFlow = ""
|
||||
Var TelephoneNumberQR = "0899999999"
|
||||
Var ServiceType = "coffee"
|
||||
Var ECommerceQR = ""
|
||||
Var ECommerceQR = ECommerceQR + PriceDrink
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + DiscountDrink
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + SessionID2
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + SelectDrink
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + "FZB:2/"
|
||||
|
||||
If Seeker.IntVendingCampaign > 0 Then
|
||||
Var ECommerceQR = ECommerceQR + Seeker.VendingCode
|
||||
Var ECommerceQR = ECommerceQR + ":"
|
||||
Var ECommerceQR = ECommerceQR + Seeker.CodeNumber
|
||||
Var ECommerceQR = ECommerceQR + ":"
|
||||
Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3
|
||||
EndIf
|
||||
|
||||
If Seeker.IntVendingCredit > 0 Then
|
||||
If Seeker.IntVendingCampaign > 0 Then
|
||||
Var ECommerceQR = ECommerceQR + "|"
|
||||
EndIf
|
||||
Var ECommerceQR = ECommerceQR + "CRD"
|
||||
Var ECommerceQR = ECommerceQR + ":"
|
||||
Var ECommerceQR = ECommerceQR + Seeker.TNumberTaobinCredit
|
||||
Var ECommerceQR = ECommerceQR + ":"
|
||||
Var ECommerceQR = ECommerceQR + Seeker.IntVendingCredit
|
||||
Var ECommerceQR = ECommerceQR + ":"
|
||||
Var ECommerceQR = ECommerceQR + PointCrm
|
||||
EndIf
|
||||
|
||||
|
||||
Var ServiceParameter = "max"
|
||||
Var ServiceCharge = 0
|
||||
Var AccountType = "new"
|
||||
Var testservice = "kbank"
|
||||
Var tc = ""
|
||||
Var GetScore = ""
|
||||
Var OperatorName = ""
|
||||
Var SessionID = ""
|
||||
|
||||
Var PayDetail2 = Seeker.PayDetail2
|
||||
GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
|
||||
Var ReqPayInfoFlag = 1
|
||||
Refresh
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
||||
<Button>
|
||||
<X> 552 </X>
|
||||
<Y> 1499 </Y>
|
||||
<State> PayState3</State>
|
||||
<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_pay_with_codeOther.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bp_pay_with_codeOther.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/inter/aus/image/payment_cash/bd_pay_with_codeOther.png" </FilenameDisable>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
If Timeout < 120 Then
|
||||
If CoinInFlag = 0 Then
|
||||
If CancelFlag = 0 Then
|
||||
If alphaState = "Invisible" Then
|
||||
|
||||
Var QR_POPUP = "/img_popup1.png"
|
||||
Var QRCODE99 = ""
|
||||
|
||||
Var LOADING_STATE = "Enable"
|
||||
|
||||
Var FlagQROpened = 1
|
||||
Var alphaState = "Enable"
|
||||
|
||||
VendingQR ON
|
||||
|
||||
Var SessionID2 = SelectSlot + ":"
|
||||
Var SessionID2 = SessionID2 + Seeker.ExtendData
|
||||
|
||||
Var CreditAmount1 = ""
|
||||
Var ServiceAmountFlow = ""
|
||||
Var TelephoneNumberQR = "0899999999"
|
||||
Var ServiceType = "coffee"
|
||||
Var ECommerceQR = ""
|
||||
Var ECommerceQR = ECommerceQR + PriceDrink
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + DiscountDrink
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + SessionID2
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + SelectDrink
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + "FZB:2/"
|
||||
|
||||
If Seeker.IntVendingCampaign > 0 Then
|
||||
Var ECommerceQR = ECommerceQR + Seeker.VendingCode
|
||||
Var ECommerceQR = ECommerceQR + ":"
|
||||
Var ECommerceQR = ECommerceQR + Seeker.CodeNumber
|
||||
Var ECommerceQR = ECommerceQR + ":"
|
||||
Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3
|
||||
EndIf
|
||||
|
||||
If Seeker.IntVendingCredit > 0 Then
|
||||
If Seeker.IntVendingCampaign > 0 Then
|
||||
Var ECommerceQR = ECommerceQR + "|"
|
||||
EndIf
|
||||
Var ECommerceQR = ECommerceQR + "CRD"
|
||||
Var ECommerceQR = ECommerceQR + ":"
|
||||
Var ECommerceQR = ECommerceQR + Seeker.TNumberTaobinCredit
|
||||
Var ECommerceQR = ECommerceQR + ":"
|
||||
Var ECommerceQR = ECommerceQR + Seeker.IntVendingCredit
|
||||
Var ECommerceQR = ECommerceQR + ":"
|
||||
Var ECommerceQR = ECommerceQR + PointCrm
|
||||
EndIf
|
||||
|
||||
|
||||
Var ServiceParameter = "max"
|
||||
Var ServiceCharge = 0
|
||||
Var AccountType = "new"
|
||||
Var testservice = "kbank"
|
||||
Var tc = ""
|
||||
Var GetScore = ""
|
||||
Var OperatorName = ""
|
||||
Var SessionID = ""
|
||||
|
||||
Var PayDetail2 = Seeker.PayDetail2
|
||||
GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
|
||||
Var ReqPayInfoFlag = 1
|
||||
Refresh
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Button>
|
||||
<X> 360 </X>
|
||||
|
|
|
|||
87
xml/testscanQRcode.xml
Normal file
87
xml/testscanQRcode.xml
Normal file
|
|
@ -0,0 +1,87 @@
|
|||
<Page>
|
||||
<Width> 1080 </Width>
|
||||
<Height> 1312 </Height>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<Background> "0x2c2928" </Background>
|
||||
|
||||
<EventOpen>
|
||||
|
||||
Var KornCameraXW = 800
|
||||
Var KornCameraXH = 800
|
||||
Var scanresult = ""
|
||||
Var scanmsg = ""
|
||||
|
||||
INITSCANQR
|
||||
|
||||
</EventOpen>
|
||||
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
||||
|
||||
Refresh
|
||||
TimerReset
|
||||
|
||||
</EventTimeout>
|
||||
|
||||
<EventScanQRResult>
|
||||
|
||||
If scanresult = "true" Then
|
||||
Open "ROOT/taobin_project/xml/testscanQRcodeResult.xml"
|
||||
EndIf
|
||||
|
||||
|
||||
</EventScanQRResult>
|
||||
|
||||
|
||||
; header
|
||||
<Image>
|
||||
<X> 0 </X>
|
||||
<Y> 0 </Y>
|
||||
<Height> 80 </Height>
|
||||
<Width> 1080 </Width>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<Filename> "ROOT/taobin_project/image/new_vending_info/nav-bar-mid.png" </Filename>
|
||||
</Image>
|
||||
|
||||
;back
|
||||
<Button>
|
||||
<X> 40 </X>
|
||||
<Y> 20 </Y>
|
||||
<Filename> "ROOT/taobin_project/image/new_vending_info/arrow_back.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/new_vending_info/arrow_back.png" </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
Open "ROOT/taobin_project/xml/page_board.xml"
|
||||
</EventClick>
|
||||
|
||||
</Button>
|
||||
|
||||
|
||||
<CameraX>
|
||||
<X> 200 </X>
|
||||
<Y> 400 </Y>
|
||||
<Name>"usbfront"</Name>
|
||||
<Width> KornCameraXW </Width>
|
||||
<Height> KornCameraXH </Height>
|
||||
<State> Enable </State>
|
||||
</CameraX>
|
||||
|
||||
|
||||
<Button>
|
||||
<X> 50 </X>
|
||||
<Y> info_cancel_y </Y>
|
||||
<Filename> "ROOT/taobin_project/image/new_vending_info/exit_button.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/new_vending_info/exit_button.png" </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_board.xml"
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
||||
</Page>
|
||||
75
xml/testscanQRcodeResult.xml
Normal file
75
xml/testscanQRcodeResult.xml
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
<Page>
|
||||
<Width> 1080 </Width>
|
||||
<Height> 1312 </Height>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<Background> "0x2c2928" </Background>
|
||||
|
||||
<EventOpen>
|
||||
|
||||
</EventOpen>
|
||||
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
||||
|
||||
Refresh
|
||||
TimerReset
|
||||
|
||||
</EventTimeout>
|
||||
|
||||
|
||||
|
||||
; header
|
||||
<Image>
|
||||
<X> 0 </X>
|
||||
<Y> 0 </Y>
|
||||
<Height> 80 </Height>
|
||||
<Width> 1080 </Width>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<Filename> "ROOT/taobin_project/image/new_vending_info/nav-bar-mid.png" </Filename>
|
||||
</Image>
|
||||
|
||||
;back
|
||||
<Button>
|
||||
<X> 40 </X>
|
||||
<Y> 20 </Y>
|
||||
<Filename> "ROOT/taobin_project/image/new_vending_info/arrow_back.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/new_vending_info/arrow_back.png" </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
Open "ROOT/taobin_project/xml/page_board.xml"
|
||||
</EventClick>
|
||||
|
||||
</Button>
|
||||
|
||||
|
||||
<Text>
|
||||
<X> 100 </X>
|
||||
<Y> 200 </Y>
|
||||
<Width> 1080</Width>
|
||||
<Align> Center </Align>
|
||||
<Size> 60 </Size>
|
||||
<Font> KanitMediumTTF </Font>
|
||||
<Color> 0xDE794E </Color>
|
||||
<State> "Enable" </State>
|
||||
<Value> scanmsg </Value>
|
||||
</Text>
|
||||
|
||||
|
||||
<Button>
|
||||
<X> 50 </X>
|
||||
<Y> info_cancel_y </Y>
|
||||
<Filename> "ROOT/taobin_project/image/new_vending_info/exit_button.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/new_vending_info/exit_button.png" </FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_board.xml"
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
||||
</Page>
|
||||
|
|
@ -928,6 +928,26 @@
|
|||
|
||||
|
||||
|
||||
<Image>
|
||||
<X> 5 </X>
|
||||
<Y> 1200 </Y>
|
||||
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
|
||||
<EventClick>
|
||||
Open "ROOT/taobin_project/xml/testscanQRcode.xml"
|
||||
</EventClick>
|
||||
</Image>
|
||||
|
||||
<Text>
|
||||
<X> 30 </X>
|
||||
<Y> 1210 </Y>
|
||||
<Size> 30 </Size>
|
||||
<Font> fontType1 </Font>
|
||||
<Color> 0x000000 </Color>
|
||||
<Value> "TestScanQRCode" </Value>
|
||||
</Text>
|
||||
|
||||
|
||||
|
||||
;<QRCode>
|
||||
;<X> 930 </X>
|
||||
;<Y> info_cancel_y </Y>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue