Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
807a017135
18 changed files with 39 additions and 64 deletions
|
|
@ -1607,10 +1607,10 @@
|
|||
|
||||
<Button>
|
||||
<X> 216 </X>
|
||||
<Y> 1276 </Y>
|
||||
<Y> 1176 </Y>
|
||||
<State> PayWithCreditCardState </State>
|
||||
<Filename> Var( DirImage + "/bn_pay_with_ccard.png") </Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_pay_with_ccard.png") </FilenamePress>
|
||||
<Filename> Var( DirImage + "/bn_pay_with_ccard_AUS.png") </Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_pay_with_ccard_AUS.png") </FilenamePress>
|
||||
<FilenameDisable> Var( DirImage + "/bd_pay_with_ccard.png") </FilenameDisable>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
|
|
@ -1635,7 +1635,7 @@ EndIf
|
|||
|
||||
<Button>
|
||||
<X> 439 </X>
|
||||
<Y> 1276 </Y>
|
||||
<Y> 1176 </Y>
|
||||
<State> PayWithTaoCreditState </State>
|
||||
<Filename> Var( DirImage + "/bn_pay_with_credit_AUS.png") </Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_pay_with_credit_AUS.png") </FilenamePress>
|
||||
|
|
@ -1666,7 +1666,7 @@ EndIf
|
|||
|
||||
<Button>
|
||||
<X> 664 </X>
|
||||
<Y> 1276 </Y>
|
||||
<Y> 1176 </Y>
|
||||
<State> PayWithCouponState </State>
|
||||
<Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
|
||||
|
|
@ -1694,7 +1694,7 @@ EndIf
|
|||
|
||||
<Button>
|
||||
<X> 552 </X>
|
||||
<Y> 1499 </Y>
|
||||
<Y> 1399 </Y>
|
||||
;<State> PayWithFatzebraState </State>
|
||||
<State> "Invisible" </State>
|
||||
<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_pay_qrcode.png" </Filename>
|
||||
|
|
@ -1784,7 +1784,7 @@ EndIf
|
|||
|
||||
<Button>
|
||||
<X> 552 </X>
|
||||
<Y> 1499 </Y>
|
||||
<Y> 1399 </Y>
|
||||
<State> "Enable" </State>
|
||||
<Filename> Var( DirImage + "/bn_pay_with_comingSoon.png") </Filename>
|
||||
<FilenamePress> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenamePress>
|
||||
|
|
@ -1798,7 +1798,7 @@ EndIf
|
|||
|
||||
<Button>
|
||||
<X> 328 </X>
|
||||
<Y> 1499 </Y>
|
||||
<Y> 1399 </Y>
|
||||
<State> PayWithAUBState </State>
|
||||
<Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_pay_with_ema.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bp_pay_with_ema.png" </FilenamePress>
|
||||
|
|
@ -2412,7 +2412,7 @@ EndIf
|
|||
|
||||
<Text>
|
||||
<X> 0 </X>
|
||||
<Y> 1590 </Y>
|
||||
<Y> 1640 </Y>
|
||||
<Size> 36 </Size>
|
||||
<Align> Center </Align>
|
||||
<Width> 1080 </Width>
|
||||
|
|
@ -2424,7 +2424,7 @@ EndIf
|
|||
|
||||
<Text>
|
||||
<X> 0 </X>
|
||||
<Y> 1660 </Y>
|
||||
<Y> 1700 </Y>
|
||||
<Size> 20 </Size>
|
||||
<Align> Center </Align>
|
||||
<Width> 1080 </Width>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue