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

Merge branch 'master' of forthrd.ddns.net:/1TBHDD/ikong/taobin_project

Browse source
This commit is contained in:
kong 2021-03-16 16:48:36 +07:00
commit c3e997dbc7
12 changed files with 202 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/collectiing/text_16.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

BIN
image/collectiing_en/text_16.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

BIN
image/page_payment_cash_extend/img_popup14.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Before After
Before After

BIN
image/page_payment_cash_extend_en/img_popup14.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Before After
Before After

281
xml/page_brewing3.xml
View file

@ -26,8 +26,43 @@
Var waitAckPay = 0 Var waitAckPay = 0
Var VendingTSIDTmp = "" Var VendingTSIDTmp = ""
If PayWithQR = 1 Then If PayWithQR = 1 Then
Var VendingTSIDTmp = VendingTSID Var VendingTSIDTmp = VendingTSID
If TNumberTaobinCredit = "" Then
Var TelephoneNumber = "0899999999"
Var PayO2 = ""
Else
Var TelephoneNumber = TNumberTaobinCredit
Var PayO2 = CoffeePinNumber
EndIf
If ChangeFlag2 = 1 Then
Var TelephoneNumber = "0899999999"
Var PayO2 = ""
Var VendingDiscount = 0
Var VendingCampaign = 0
Var ServiceType = "credit"
Var SessionID2 = SelectDrink
Var ServiceCredit = "coffee"
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else
If StoreCreditFlag = 1 Then
Var VendingDiscount = 0
Var VendingCampaign = 0
Var ServiceType = "credit"
Var SessionID2 = SelectDrink
Var ServiceCredit = "coffee"
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
EndIf
EndIf
EndIf EndIf
@ -78,12 +113,14 @@
Else Else
SAVELOG "back_to_main from line > 116."
Open "ROOT/taobin_project/xml/page_back_to_main.xml" Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf EndIf
Else Else
If ActionOKCase = 2 Then If ActionOKCase = 2 Then
SAVELOG "back_to_main from line > 123."
Open "ROOT/taobin_project/xml/page_back_to_main.xml" Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf EndIf
@ -133,12 +170,14 @@
Var ActionOKCase = 2 Var ActionOKCase = 2
Else Else
SAVELOG "back_to_main from line > 173."
Open "ROOT/taobin_project/xml/page_back_to_main.xml" Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf EndIf
Else Else
If ActionOKCase = 2 Then If ActionOKCase = 2 Then
SAVELOG "back_to_main from line > 180."
Open "ROOT/taobin_project/xml/page_back_to_main.xml" Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf EndIf
@ -157,7 +196,7 @@
If Simulation = "true" Then If Simulation = "true" Then
If CountDownBrewing = 0 Then If CountDownBrewing = 0 Then
Open "ROOT/taobin_project/xml/page_drinkok.xml" ;Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf EndIf
EndIf EndIf
@ -176,12 +215,13 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
If Timeout > 330 Then If Timeout > 540 Then
SAVELOG "back_to_main from line > 217."
Open "ROOT/taobin_project/xml/page_back_to_main.xml" Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf EndIf
If Timeout > 300 Then If Timeout > 480 Then
Var MachineState_Result = 2 Var MachineState_Result = 2
EndIf EndIf
@ -209,13 +249,24 @@
Var PayO2 = CoffeePinNumber Var PayO2 = CoffeePinNumber
EndIf EndIf
Var VendingDiscount = 0 Var PayDetail = "1/" + HURR_FOREVER
Var VendingCampaign = 0 Var PayDetail = PayDetail + "/"
Var ServiceType = "credit" Var PayDetail = PayDetail + SAMESALARY
Var SessionID2 = SelectDrink Var PayDetail = PayDetail + "/"
Var ServiceCredit = "coffee" Var PayDetail = PayDetail + NOBONUS
;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
Var ServiceType = "coffee"
Var ServiceCredit = SelectDrink
Var SuggestID = ""
Var SessionID2 = ""
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Var ActionOKCase = 1 Var ActionOKCase = 1
EndIf EndIf
@ -231,12 +282,20 @@
Var PayO2 = CoffeePinNumber Var PayO2 = CoffeePinNumber
EndIf EndIf
Var VendingDiscount = 0 Var PayDetail = "1/" + HURR_FOREVER
Var VendingCampaign = 0 Var PayDetail = PayDetail + "/"
;Var TelephoneNumber = "0899999999" Var PayDetail = PayDetail + SAMESALARY
Var ServiceType = "credit" Var PayDetail = PayDetail + "/"
Var SessionID2 = SelectDrink Var PayDetail = PayDetail + NOBONUS
Var ServiceCredit = "coffee"
;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
Var ServiceType = "coffee"
Var ServiceCredit = SelectDrink
Var SuggestID = ""
Var SessionID2 = ""
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Var ActionOKCase = 1 Var ActionOKCase = 1
@ -244,46 +303,30 @@
EndIf EndIf
If ChangeOK = 3 Then If ChangeOK = 3 Then
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
If ChangeOK = 4 Then
If ActionOKCase = 0 Then If ActionOKCase = 0 Then
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData Var SVT = "coffee"
Var CreditAmount1 = "" Var ACC = "089999999"
Var ServiceAmountFlow = ""
Var TelephoneNumber = "0899999999" Var PayDetail = "1/" + HURR_FOREVER
Var ServiceType = "coffee" Var PayDetail = PayDetail + "/"
Var ECommerce = "" Var PayDetail = PayDetail + SAMESALARY
Var ECommerce = ECommerce + PriceDrink Var PayDetail = PayDetail + "/"
Var ECommerce = ECommerce + "/" Var PayDetail = PayDetail + NOBONUS
Var ECommerce = ECommerce + DiscountDrink
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SessionID2
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink Var DEE = PayDetail
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + "C00" PAYEXT SVT ACC VendingTSIDTmp DEE
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + CodeNumber Var ActionOKCase = 1
Var ECommerce = ECommerce + "/" ;Open "ROOT/taobin_project/xml/page_back_to_main.xml"
Var ECommerce = ECommerce + "C"
Var ServiceParameter = "max"
Var ServiceCharge = 0
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
Var GetScore = ""
Var OperatorName = ""
Var SessionID = ""
GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
;Var Timeout = 0
Var ActionOKCase = 2
EndIf EndIf
EndIf EndIf
If MachineState_Result = 1 Then If MachineState_Result = 1 Then
If waitAckPay = 0 Then If waitAckPay = 0 Then
@ -305,8 +348,14 @@
Var ServiceCredit = SelectDrink Var ServiceCredit = SelectDrink
Var SuggestID = "" Var SuggestID = ""
Var PayDetail = "1/" + HURR_FOREVER
Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + SAMESALARY
Var PayDetail = PayDetail + "/"
Var PayDetail = PayDetail + NOBONUS
Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1" ;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
If PayWithQR = 0 Then If PayWithQR = 0 Then
If CodeChannel = 1 Then If CodeChannel = 1 Then
@ -351,46 +400,15 @@
Else Else
;no wait ack pay
Var waitAckPay = 0
If ChangeFlag2 = 1 Then Var SVT = "coffee"
Var TelephoneNumber = "0899999999" Var ACC = "089999999"
Var VendingDiscount = 0 Var DEE = PayDetail
Var VendingCampaign = 0
Var ServiceType = "credit"
Var SessionID2 = SelectDrink
Var ServiceCredit = "coffee"
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else
If StoreCreditFlag = 1 Then PAYEXT SVT ACC VendingTSIDTmp DEE
Var VendingDiscount = 0
Var VendingCampaign = 0
Var ServiceType = "credit"
Var SessionID2 = SelectDrink
Var ServiceCredit = "coffee"
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else
;no wait ack pay
Var waitAckPay = 0
Var SVT = "coffee"
Var ACC = "089999999"
Var DEE = "1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
PAYEXT SVT ACC VendingTSID DEE
EndIf
EndIf
EndIf EndIf
EndIf EndIf
@ -406,9 +424,8 @@
If ErrTimeout = 0 Then If ErrTimeout = 0 Then
Var ErrTimeout = 1 Var ErrTimeout = 1
If PayWithQR = 0 Then If PayWithQR = 0 Then
If CodeChannel = 0 Then If CodeChannel = 0 Then
If ChangeFlag = 0 Then If ChangeFlag = 0 Then
Var ChangeFlag = 1 Var ChangeFlag = 1
@ -418,88 +435,45 @@
Else Else
Change ServiceAmount2 Change ServiceAmount2
EndIf EndIf
EndIf EndIf
Else Else
If CoinAmount > 0 Then If CoinAmount > 0 Then
If ChangeFlag = 0 Then If ChangeFlag = 0 Then
Var ChangeFlag = 1 Var ChangeFlag = 1
Var ServiceAmount2 = ServiceAmount2 - IntVendingCampaign Var ServiceAmount3 = ServiceAmount2 - IntVendingCampaign
If StoreCreditFlag = 1 Then If StoreCreditFlag = 1 Then
Var ChangeOK = 2 Var ChangeOK = 2
Else Else
Change ServiceAmount2 Change ServiceAmount3
EndIf EndIf
EndIf EndIf
Else Else
Var ChangeOK = 2
If ChangeFlag2 = 1 Then
Var ChangeOK = 2
Else
If CodeChannel = 1 Then
Var ChangeOK = 4
Else
Var ChangeOK = 3
EndIf
EndIf
EndIf EndIf
EndIf EndIf
Else Else
Var ChangeOK = 3
If CodeChannel = 0 Then
If CoinAmount > 0 Then
If ChangeFlag = 0 Then
Var ChangeFlag = 1
Var ServiceAmount2 = CoinAmount
If StoreCreditFlag = 1 Then
Var ChangeOK = 2
Else
Change ServiceAmount2
EndIf
EndIf
Else
If ChangeFlag2 = 1 Then
Var ChangeOK = 2
Else
Var ChangeOK = 3
EndIf
EndIf
Else
If CoinAmount > 0 Then
If ChangeFlag = 0 Then
Var ChangeFlag = 1
Var ServiceAmount2 = CoinAmount
If StoreCreditFlag = 1 Then
Var ChangeOK = 2
Else
Change ServiceAmount2
EndIf
EndIf
Else
If ChangeFlag2 = 1 Then
Var ChangeOK = 2
Else
Var ChangeOK = 4
EndIf
EndIf
EndIf
EndIf EndIf
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_drinkfail.xml" OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_drinkfail.xml"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml"
@ -514,6 +488,7 @@
EndIf EndIf
If MachineStage = "close-maintenance" Then If MachineStage = "close-maintenance" Then
SAVELOG "back_to_main from line > 488."
Open "ROOT/taobin_project/xml/page_back_to_main.xml" Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf EndIf

3
xml/page_payment_cash.xml
View file

@ -239,6 +239,9 @@
SAVELOG "menu_page4-QR.xml > ActOK_REFID" SAVELOG "menu_page4-QR.xml > ActOK_REFID"
Refresh Refresh
Else Else
If ViewBill > 0 Then
CoinVending BILLREJECT
EndIf
SAVELOG "menu_page4-QR.xml > ActOK_make" SAVELOG "menu_page4-QR.xml > ActOK_make"
;Var VendingQRCode = "ERROR" ;Var VendingQRCode = "ERROR"
;Coin STANDBY ;Coin STANDBY

32
xml/page_payment_code.xml
View file

@ -72,6 +72,14 @@
</EventIDCard> </EventIDCard>
<EventCoin>
If ViewBill > 0 Then
CoinVending BILLREJECT
EndIf
</EventCoin>
<EventActionOk> <EventActionOk>
@ -187,6 +195,14 @@
Open "ROOT/taobin_project/xml/page_thankyou.xml" Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf EndIf
If VendingCode = "C34" Then
Var VendingCampaign = PayAmount
CoinVending OFF
;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
If VendingCode = "C36" Then If VendingCode = "C36" Then
Var VendingCampaign = PayAmount Var VendingCampaign = PayAmount
CoinVending OFF CoinVending OFF
@ -195,6 +211,22 @@
Open "ROOT/taobin_project/xml/page_thankyou.xml" Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf EndIf
If VendingCode = "C38" Then
Var VendingCampaign = PayAmount
CoinVending OFF
;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
If VendingCode = "C41" Then
Var VendingCampaign = PayAmount
CoinVending OFF
;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
Var ShowErrorText = "Enable" Var ShowErrorText = "Enable"
Var GetPayInfoFlag = 0 Var GetPayInfoFlag = 0

8
xml/page_payment_credit.xml
View file

@ -53,6 +53,14 @@
<EventIDCard> <EventIDCard>
</EventIDCard> </EventIDCard>
<EventCoin>
If ViewBill > 0 Then
CoinVending BILLREJECT
EndIf
</EventCoin>
<EventActionOk> <EventActionOk>
;Open "ROOT/taobin_project/xml/page_payment_credit2.xml" ;Open "ROOT/taobin_project/xml/page_payment_credit2.xml"

8
xml/page_payment_credit2.xml
View file

@ -76,6 +76,14 @@
</EventIDCard> </EventIDCard>
<EventCoin>
If ViewBill > 0 Then
CoinVending BILLREJECT
EndIf
</EventCoin>
<EventActionOk> <EventActionOk>

12
xml/page_payment_credit3.xml
View file

@ -57,6 +57,15 @@
</EventActionError> </EventActionError>
<EventCoin>
If ViewBill > 0 Then
CoinVending BILLREJECT
EndIf
</EventCoin>
<Image> <Image>
<X> 0 </X> <X> 0 </X>
@ -113,6 +122,9 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
CoinVending OFF CoinVending OFF

1
xml/page_payment_storeCredit.xml
View file

@ -571,6 +571,7 @@
If pageStoreCredit0 = 1 Then If pageStoreCredit0 = 1 Then
Change StoreCreditAmount Change StoreCreditAmount
Var ChangeFlag2 = 1 Var ChangeFlag2 = 1
Var TNumberTaobinCredit = ""
Open "ROOT/taobin_project/xml/page_collect_point_1.xml" Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
Else Else
CoinVending BILLREJECT CoinVending BILLREJECT

20
xml/page_payment_storeCredit0.xml
View file

@ -72,16 +72,16 @@
</Image> </Image>
<Text> ;<Text>
<X> 0 </X> ;<X> 0 </X>
<Y> 1041 </Y> ;<Y> 1041 </Y>
<Size> 100 </Size> ;<Size> 100 </Size>
<Align> Center </Align> ;<Align> Center </Align>
<Width> 1080 </Width> ;<Width> 1080 </Width>
<Font> KanitRegularTTF </Font> ;<Font> KanitRegularTTF </Font>
<Color> 0xDE794E </Color> ;<Color> 0xDE794E </Color>
<Value> StoreCreditAmount </Value> ;<Value> StoreCreditAmount </Value>
</Text> ;</Text>