From 7b406d3881a6d9ec77f4fe7ac2720cba487e6f68 Mon Sep 17 00:00:00 2001 From: miggaze Date: Mon, 15 Mar 2021 13:01:05 +0700 Subject: [PATCH] ... --- image/collectiing/text_16.png | Bin 4729 -> 12132 bytes image/collectiing_en/text_16.png | Bin 6016 -> 11618 bytes xml/page_brewing3.xml | 280 ++++++++++++++----------------- xml/page_payment_code.xml | 24 +++ xml/page_payment_storeCredit.xml | 1 + 5 files changed, 152 insertions(+), 153 deletions(-) diff --git a/image/collectiing/text_16.png b/image/collectiing/text_16.png index b096a8a637a7c1b66fe615cdd4fc8c88199b41c3..94adb586415aa83932b726412e9b9469024809a1 100644 GIT binary patch literal 12132 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 z zfFRDY+SrOd+MwVA9I)iI<83~@8R{F@tLG+|n5B0if5&p}@6^R_MfO|%2$!*6=c@4t z>~=C8(rVlNBPlN{9tG;4%A~flmtY}00?b*HM8)V}gt2YSY0k^twyb4&t9$7oZdVfdbFCmnU6y`by|%2tEfTrEFhzLtgdp*gFi3B zlwScc4DU1g;z*4fR@AnAcVWw#kHaT5SyZh`X?UaE3!ojz8_n~!b0@i!quuRo2ozU8M$+!*02oJcwjFNX!w@c{|MLc zrdpJ|O{5Ge@98U+-8s7W$TaCl#;sRQZ! z7MY8CL0LkD8WR2WQn{_Gev4Q?68VrXi3d&tQi+(Yp5f(AAeQlh(>wZ3~t69_})QzeA%|!|L*4kqZ9zyk2_Ex0xrjbLvqOUj@6MVcM)Drge z`{nFP>OTm=>|-EOwyzWZ%N-M3^s~g*MfX=Zmcl>^AG6G{ia=SAGe<9_&iKBY%{zri z`;#%gb^9@2|4hc)U%7SS+6QjI%)60Ggz(o7yj4)@moEf*SxI=;J}`BIa#SFS_(+Vz z5xTcWk#gBD{!3DTQFvCYZP7R^+Z>+u zt(Um2`{%8-srDD%3D;6BrD_imFMUs?IV3r6i}P5295wH^o9uI}l}4}z6zcwMEK2op zF5HDGa^UGqudwkN$$EJ!ajg@ZJZ0AU&xd4?AQ?eTFEqBmoc>Yhdgx8g+tKHC z0MeqMz5ve47asUZAEzKey_@1YWevSb1(OJlhvu}`&H`UE-!Bdj?T9^9pI;SHJgITE zPJ4#(?A6c`bM=j9wQH6LB=gsoHUGQ~C|CJ4NK;eJ>(KHPbFgJTn$qMqL=-O|zL3z? z(vp$o7-`A6%GuHTo<<_AKd!p{TcI8J_Ib)qVCK5`!yC0iP0wI=9#I#sdG?gJa%{$( z_0~(Kqb9vq><9hVL?`WR{Yg0>0k9zTllIJ!m-#pw-#Pi)gyHMq-e$|&hTiG&;Q1MG zILC9KgyizuOT%xUiEJ~^F@B!+z6UiRO$)e}3h^P;JIAi!bM|y|$=(upeV~hQyrS!W zo=R(EGLVxSGY-A2F#nE+ht2Jt<39hfsp@KIJ@4jVBS;P@q~AiL@0!Q#=k8{v<7!K~ z{nACHvQ-t&KB7qC+Yub26J_=9IVKOo#Jh7#5qb zJ)vus$et$o@UOBu&fS+YrZ>vSh_Q%9>7FpEi@pikm##Yp@EhvZji0>;w1aLb#R2zv z}4U^Vc$C>e@T{=j<~V0w78bb;3=0j z`X*Mc59KCiw(IRT3zo45)aPHFCDJ(ALPcLOkk~7~H_MRD+HP)V?kj{Pl=T1@vIfd5&E8+(03BoB4#;Bu^ zt|v~9gQv5Ew@InIVY~Joz}3MnBALb8>3Nq&l`yF{E5k@?`9~GL?=VJx-zm|MzZ$^b zCQ1T%#G@=Z9KN_8i3T-uuiWdaiod?J{$t0iY@*l{$5jZ*-bwYyUd-p*T>V#eO61Ef zw!wccq9V7i$@3)9iVaf{b$FZJB3o=^iH$M4@_kZu)G6(+J~mwCAQ6XQ?=CRLBoWcL zE=k)xH&XJ8K0um9m>P9R-3`fpb&-} zOZ_T~yy8G~nzy=@B{A8a&U&gSkK6FdT?!-a}keEwR&9 zysN&!qkj8`WNhekzj#E$+&#Koa?QZgbArt^?L*U~YVD-8bv5X5Lpp z`>_ry!c7Z`w;*P6wUK}C+6ehF-@=N$0||+Or>fxoJ|4gn<~|Fe4YMW|!F~wd%9Lkr>x3jm~lISR5Yz zjB7lW7MPYqu60Gcjve1hU$VI?Ql`Fu$x8FqQl0}7wGS8m(mUHkk`Y*M9W96uum>Y@6SILzXKV4V^IFxlTLoMaz&ZVl83eTAOV zA78kBE~TxFVsxv#OHS{Vd{yx6qx!Drz3iA;!H9}q-<8S#`qD6~vo-X!@_D0s-)sQ; zzJUk;*iPEPJCbRwXN6@8n1g5TemA`vfBetj0DvOy`<{>YqA1wIvk@Cw^PhtC|I7a! c0jI)8{J2pf*}NXpp8xDJl8O@5;zqyz4?2iVrvLx| delta 4315 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 br0yY@+C_*VofP8v-+x6}6`AT!W}*KJhlW0n delta 5623 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 RE{FgC002ovPDHLkV1h}qwQ>Le diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 6e12e771..8fd83990 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -26,8 +26,43 @@ Var waitAckPay = 0 Var VendingTSIDTmp = "" + + + + If PayWithQR = 1 Then 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 @@ -78,12 +113,14 @@ Else + SAVELOG "back_to_main from line > 116." Open "ROOT/taobin_project/xml/page_back_to_main.xml" EndIf Else If ActionOKCase = 2 Then + SAVELOG "back_to_main from line > 123." Open "ROOT/taobin_project/xml/page_back_to_main.xml" EndIf @@ -133,12 +170,14 @@ Var ActionOKCase = 2 Else + SAVELOG "back_to_main from line > 173." Open "ROOT/taobin_project/xml/page_back_to_main.xml" EndIf Else If ActionOKCase = 2 Then + SAVELOG "back_to_main from line > 180." Open "ROOT/taobin_project/xml/page_back_to_main.xml" EndIf @@ -155,7 +194,7 @@ If Simulation = "true" Then If CountDownBrewing = 0 Then - Open "ROOT/taobin_project/xml/page_drinkok.xml" + ;Open "ROOT/taobin_project/xml/page_drinkok.xml" EndIf EndIf @@ -174,12 +213,13 @@ 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" EndIf - If Timeout > 300 Then + If Timeout > 480 Then Var MachineState_Result = 2 EndIf @@ -207,13 +247,24 @@ Var PayO2 = CoffeePinNumber EndIf - - Var VendingDiscount = 0 - Var VendingCampaign = 0 - Var ServiceType = "credit" - Var SessionID2 = SelectDrink - Var ServiceCredit = "coffee" + + Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + 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 + Var ActionOKCase = 1 EndIf @@ -229,12 +280,20 @@ Var PayO2 = CoffeePinNumber EndIf - Var VendingDiscount = 0 - Var VendingCampaign = 0 - ;Var TelephoneNumber = "0899999999" - Var ServiceType = "credit" - Var SessionID2 = SelectDrink - Var ServiceCredit = "coffee" + Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + 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 Var ActionOKCase = 1 @@ -242,46 +301,29 @@ EndIf If ChangeOK = 3 Then - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - - If ChangeOK = 4 Then If ActionOKCase = 0 Then - Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + ExtendData - Var CreditAmount1 = "" - Var ServiceAmountFlow = "" - Var TelephoneNumber = "0899999999" - Var ServiceType = "coffee" - Var ECommerce = "" - Var ECommerce = ECommerce + PriceDrink - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + DiscountDrink - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + SessionID2 - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + SelectDrink - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + "C00" - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + CodeNumber - Var ECommerce = ECommerce + "/" - 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 + + Var SVT = "coffee" + Var ACC = "089999999" + + Var PayDetail = "1/" + HURR_FOREVER + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + SAMESALARY + Var PayDetail = PayDetail + "/" + Var PayDetail = PayDetail + NOBONUS + + + + + Var DEE = PayDetail + + PAYEXT SVT ACC VendingTSIDTmp DEE + + Var ActionOKCase = 1 EndIf EndIf - + If MachineState_Result = 1 Then If waitAckPay = 0 Then @@ -303,8 +345,14 @@ Var ServiceCredit = SelectDrink 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 CodeChannel = 1 Then @@ -349,46 +397,15 @@ Else - + ;no wait ack pay + Var waitAckPay = 0 - If ChangeFlag2 = 1 Then - Var TelephoneNumber = "0899999999" - 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 + Var SVT = "coffee" + Var ACC = "089999999" + Var DEE = PayDetail - 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 @@ -404,9 +421,8 @@ If ErrTimeout = 0 Then Var ErrTimeout = 1 - - If PayWithQR = 0 Then + If PayWithQR = 0 Then If CodeChannel = 0 Then If ChangeFlag = 0 Then Var ChangeFlag = 1 @@ -416,88 +432,45 @@ Else Change ServiceAmount2 EndIf - + EndIf + Else + If CoinAmount > 0 Then If ChangeFlag = 0 Then Var ChangeFlag = 1 - Var ServiceAmount2 = ServiceAmount2 - IntVendingCampaign + Var ServiceAmount3 = ServiceAmount2 - IntVendingCampaign If StoreCreditFlag = 1 Then Var ChangeOK = 2 Else - Change ServiceAmount2 + Change ServiceAmount3 EndIf EndIf Else - - If ChangeFlag2 = 1 Then - Var ChangeOK = 2 - Else - If CodeChannel = 1 Then - Var ChangeOK = 4 - Else - Var ChangeOK = 3 - EndIf - - EndIf + Var ChangeOK = 2 EndIf - + EndIf + Else - - 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 - - - + Var ChangeOK = 3 EndIf + + + + + + + + + + OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_drinkfail.xml" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml" @@ -512,6 +485,7 @@ EndIf If MachineStage = "close-maintenance" Then + SAVELOG "back_to_main from line > 488." Open "ROOT/taobin_project/xml/page_back_to_main.xml" EndIf diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml index 80d2574f..4e4d94a5 100644 --- a/xml/page_payment_code.xml +++ b/xml/page_payment_code.xml @@ -187,6 +187,14 @@ Open "ROOT/taobin_project/xml/page_thankyou.xml" 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 Var VendingCampaign = PayAmount CoinVending OFF @@ -195,6 +203,22 @@ Open "ROOT/taobin_project/xml/page_thankyou.xml" 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 GetPayInfoFlag = 0 diff --git a/xml/page_payment_storeCredit.xml b/xml/page_payment_storeCredit.xml index 83f79b3e..5e0cf697 100644 --- a/xml/page_payment_storeCredit.xml +++ b/xml/page_payment_storeCredit.xml @@ -571,6 +571,7 @@ If pageStoreCredit0 = 1 Then Change StoreCreditAmount Var ChangeFlag2 = 1 + Var TNumberTaobinCredit = "" Open "ROOT/taobin_project/xml/page_collect_point_1.xml" Else CoinVending BILLREJECT