pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

merge master

Browse source
This commit is contained in:
kong 2020-11-02 21:21:31 +07:00
commit ae15637ebb
8 changed files with 112 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xml/page_board.xml
View file

@ -44,7 +44,7 @@
Var XPosiShowCountDownBrew = 768
If MachineStage = "close-maintenance" Then
Open "ROOT/taobin_project/xml/page_show_error.xml"
;Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
@ -58,13 +58,13 @@
If MachineStage = "close-maintenance" Then
Open "ROOT/taobin_project/xml/page_show_error.xml"
;Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
If MachineStage = "drink-failed" Then
Open "ROOT/taobin_project/xml/page_show_error.xml"
;Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf

23
xml/page_brewing2.xml
View file

@ -12,6 +12,8 @@
Var Timeout = 0
Var PrintCoinAmount = 0
</EventOpen>
@ -256,6 +258,8 @@
If ErrTimeout = 0 Then
Var ErrTimeout = 1
If PayWithQR = 0 Then
If CodeChannel = 0 Then
If ChangeFlag = 0 Then
@ -265,6 +269,7 @@
EndIf
Else
If CoinAmount > 0 Then
If ChangeFlag = 0 Then
Var ChangeFlag = 1
Var ServiceAmount2 = ServiceAmount2 - IntVendingCampaign
@ -272,8 +277,11 @@
EndIf
Else
Var ChangeOK = 4
EndIf
EndIf
Else
@ -363,6 +371,8 @@
Var MachineState_Result = 2
EndIf
EndIf
Refresh
</EventMachine>
@ -417,6 +427,19 @@
<Value> ShowCountDownBrewing </Value>
</Text>
<Text>
<X> 100 </X>
<Y> 470 </Y>
<Align> End </Align>
<Width> 153 </Width>
<Size> 30 </Size>
<Font> RobotoBold </Font>
<Color> 0x513C2F </Color>
<Value> MachineStage </Value>
</Text>
<Text>
<X> 0 </X>
<Y> 1880 </Y>

3
xml/page_catalog.xml
View file

@ -33,6 +33,9 @@
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
SAVELOG SoundPlaying
If countDownRetrun > 0 Then
Var countDownRetrun = countDownRetrun - 1
EndIf

3
xml/page_lid_straw.xml
View file

@ -183,11 +183,10 @@
<EventMachine>
If MachineStage = "drink-failed" Then
Var MachineState_Result = 1
Var MachineState_Result = 2
Open "ROOT/taobin_project/xml/page_brewing2.xml"
EndIf
<EventMachine>
If MachineStage = "drink-success" Then
Var MachineState_Result = 1
EndIf

2
xml/page_payment.xml
View file

@ -34,7 +34,9 @@
Var IntVendingCampaign = 0
Var FreeVendingCampaign = 0
Var CodeChannel = 0
Var CoinVendingOnFlag = 0

53
xml/page_payment_cash.xml
View file

@ -29,13 +29,14 @@
Var alphaState = "Invisible"
Var CoinInFlag = 0
Var CoinAmount = 0
;Var CoinAmount = 0
Var CancelFlag = 0
Var CancelCounter = 0
Var CoinInCounter = 0
Var PayAmount = PriceDrink
Var RemainAmount = PayAmount - IntVendingCampaign
Var RemainAmount = PayAmount - IntVendingCampaign
Var RemainAmount = RemainAmount - CoinAmount
Var RemainAmountStr = "" + RemainAmount
Var Timeout = 0
Var PayOK = 0
@ -70,7 +71,14 @@
If QRChannel = 0 Then
;Var VendingQRCode = "ERROR"
VendingQR ON
CoinVending ON
If CoinVendingOnFlag = 0 Then
CoinVending ON
Var CoinVendingOnFlag = 1
Else
EndIf
;Var QRCODE99 = ""
@ -110,6 +118,11 @@
Var PayState2 = "Disable"
EndIf
Var PayState3 = "Enable"
If CoinAmount > 0 Then
Var PayState2 = "Disable"
Var PayState3 = "Disable"
Var CoinInFlag = 1
EndIf
Var showRemaining = charOfBaht + RemainAmountStr
EndIf
@ -136,6 +149,36 @@
EndIf
If CoinInOK = 0 Then
Var RemainAmount = PayAmount - CoinAmount
Var RemainAmount = RemainAmount - IntVendingCampaign
Var SumCoinAmount = CoinAmount + IntVendingCampaign
If SumCoinAmount >= PayAmount Then
;Var VendingQRCode = "ERROR"
CoinVending OFF
Var Canout = SumCoinAmount - PayAmount
If Canout = 0 Then
Var RemainAmountStr = 0
Else
Var RemainAmountStr = "ทอน " + Canout
EndIf
Var CancleState = "Disable"
Var CoinInOK = 1
Var CoinInCounter = 0
Else
Var RemainAmountStr = "" + RemainAmount
EndIf
;Var RemainAmount = 0
Var showRemaining = charOfBaht + RemainAmountStr
EndIf
</EventOpen>
@ -517,7 +560,7 @@
If CoinInFlag = 0 Then
Var alphaState = "Enable"
CoinVending OFF
;CoinVending OFF
VendingQR ON
Refresh
@ -645,7 +688,7 @@
<Volume> SoundVolume </Volume>
<EventClick>
Var alphaState = "Invisible"
CoinVending ON
;CoinVending ON
VendingQR OFF
Refresh
</EventClick>

18
xml/page_payment_code.xml
View file

@ -17,9 +17,9 @@
;Var VendingQRCode = "ERROR"
VendingQR ON
Var QRCODE99 = ""
;Var QRCODE99 = ""
CoinVending OFF
;CoinVending OFF
Var ShowTextNumber = "Enable"
Var ShowErrorText = "Invisible"
@ -100,6 +100,8 @@
Else
Var FreeVendingCampaign = 1
If VendingCode = "C13" Then
;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
MakeDrinkV1 SelectDrink SelectSugarID
@ -157,6 +159,7 @@
Var GetPayInfoFlag = 0
Var CodeChannel = 0
Var Tel_Confirm_State = "Disable"
Refresh
EndIf
@ -188,6 +191,7 @@
If TelNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
@ -209,6 +213,7 @@
If TelNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
@ -230,6 +235,7 @@
If TelNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
@ -251,6 +257,7 @@
If TelNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
@ -272,6 +279,7 @@
If TelNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
@ -293,6 +301,7 @@
If TelNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
@ -314,6 +323,7 @@
If TelNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
@ -335,6 +345,7 @@
If TelNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
@ -356,6 +367,7 @@
If TelNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
EndIf
Var ShowErrorText = "Invisible"
</EventClick>
</Button>
@ -378,7 +390,7 @@
TimerReset
Refresh
Var ShowErrorText = "Invisible"
</EventClick>
</Button>

24
xml/page_thankyou.xml
View file

@ -14,6 +14,7 @@
Var ChangeFlag = 0
Var ErrTimeout = 0
Var ActionOKCase = 0
Var ChangeTimeout = 0
</EventOpen>
<Timeout> 1000 </Timeout>
@ -23,15 +24,24 @@
Var Timeout = Timeout + 1
If Timeout = 3 Then
If IntVendingCampaign < PayAmount Then
Var SumCoinAmount = CoinAmount + IntVendingCampaign
If SumCoinAmount >= PayAmount Then
Var Canout = SumCoinAmount - PayAmount
If Canout > 0 Then
Change Canout
If FreeVendingCampaign = 0 Then
If IntVendingCampaign < PayAmount Then
Var SumCoinAmount = CoinAmount + IntVendingCampaign
If SumCoinAmount >= PayAmount Then
Var Canout = SumCoinAmount - PayAmount
If Canout > 0 Then
Change Canout
EndIf
EndIf
EndIf
EndIf
Else
Var Canout = CoinAmount
If Canout > 0 Then
Change Canout
EndIf
EndIf
EndIf