diff --git a/inter/tha/configure.ev b/inter/tha/configure.ev index ba85bdc8..994a8b44 100644 --- a/inter/tha/configure.ev +++ b/inter/tha/configure.ev @@ -8,7 +8,7 @@ Var EnableMultiInstanceFromBoxID = 1 EndIf If BoxID = 105005 Then - + Var EnableMultiInstanceFromBoxID = 1 EndIf If BoxID = 176277 Then diff --git a/inter/tha/xml/page_help_center.lxml b/inter/tha/xml/page_help_center.lxml index 4c590ea9..f820f3b5 100644 --- a/inter/tha/xml/page_help_center.lxml +++ b/inter/tha/xml/page_help_center.lxml @@ -37,397 +37,24 @@ Var Problem_Process_State[0] = "Enable" Var Problem_Process_State[1] = "Enable" + Var Timeout = 0 + - - - Var Timeout = 0 - - SetInstanceIgnoreTouch - - DEBUGVAR SlientRefreshIndex - - 1000 - - If ReadyForBrew = "false" Then - SAVELOG "Back to main1" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - - EndIf - DEBUGVAR Timeout - DEBUGVAR PayOK - DEBUGVAR ChangeOK - DEBUGVAR CancelFlag - If CreditCardButtonState = "Invisible" Then + If Timeout > 120 Then + SAVELOG "Timeout" + + OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" - Else - Var X_CASH1 = 216 - 113 - Var X_CASH2 = 439 - 113 - Var X_CASH3 = 664 - 113 - EndIf - - - If CamFlag = 1 Then - Var CamCount = CamCount + 1 - If CamCount > 2 Then - facecompare 10 - Var CamFlag = 0 - Var CamCount = 0 - EndIf - EndIf - - - - If AdultState2 = "Enable" Then - Var countAdultS2 = countAdultS2 + 1 - - If countAdultS2 > 60 Then - Var AdultState2 = "Invisible" - Var AdultState3 = "Enable" - EndIf - Else - Var countAdultS2 = 0 - EndIf - - - Var Timeout = Timeout + 1 - - - If Timeout >= 120 Then - Var alphaState = "Invisible" - Var cancelButtonQRPopupState = "Invisible" - Var PopupTimeoutEnable = "Invisible" - Var QRCodeImageState = "Invisible" - - - If RoadShow = "true" Then - Else - Var TaobinCreditButtonState = "Disable" - Var EWalletButtonState = "Disable" - EndIf - - Var LOADING_STATE = "Invisible" - Var QRErrorState = "Invisible" - - EndIf - - - If Timeout > 210 Then - If ActionOKCase = 1 Then - Var PayInfoCFlag = 1 - EndIf EndIf - - If PayInfoCFlag = 1 Then - If Seeker.CodeChannel = 1 Then - Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + Seeker.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 + Seeker.VendingCode - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + Seeker.CodeNumber - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + "C:" - Var ECommerce = ECommerce + Seeker.IntVendingCampaign - 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 - EndIf - If Seeker = "curr" Then - If PressCancel_CashPopup = 2 Then - Open "ROOT/taobin_project/xml/page_payment.xml" - EndIf - Open "ROOT/taobin_project/xml/page_catalog.xml" - Else - - If PressCancel_CashPopup = 2 Then - Open "ROOT/taobin_project/xml/page_payment.xml" - EndIf - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - EndIf - EndIf - - - If TestLoopMakeDrink = 1 Then - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" - EndIf - - - - If CoinInOK = 1 Then - Var CoinInCounter = CoinInCounter + 1 - If CoinInCounter = 1 Then - - SAVELOG "CoinInOk OK" - - ;Var ChangeOK = 1 - Var Timeout = 180 - Var PayOK = 1 - - EndIf - EndIf - - Var stringLog = "Timeout " + Timeout - Var stringLog = stringLog + " PayOK" - Var stringLog = stringLog + PayOK - - - If Timeout > 180 Then - If PayOK = 1 Then - - If Seeker = "curr" Then - - If New_Payment = 1 Then - __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID - EndIf - MakeDrinkV1 SelectDrink SelectSugarID - Var TxRef1 = "" - CreateTxRef1 TxRef1 - Else - Var TxRef1 = "" - CreateTxRef1 TxRef1 - Var DrinkPaid = SelectDrink - Var PaidPaymentFromNextStage = 1 - - EndIf - - Open "ROOT/taobin_project/xml/page_thankyou.xml" - - Else - If CancelFlag = 0 Then - SAVELOG "Timeout > 180 s." - - If ViewBill > 0 Then - CoinVending BILLREJECT - EndIf - - CoinVending OFF - Var CancelFlag = 1 - Var cancelState = "Enable" - - If CashlessPayFlag = 1 Then - Var CashlessPayFlag = 0 - If KBankCashlessMachine = 1 Then - - Else - CashlessReq CANCEL Seeker.CashlessVendingTrackNumber - EndIf - EndIf - - Var CancelCounter = 0 - If CoinAmount = 0 Then - - If Seeker.IntVendingCredit > 0 Then - Var BmiYear = Seeker.IntVendingCredit - Var GetScore = "useCredit" - AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore - Var Seeker.IntVendingCredit = 0 - Var Seeker.CurrCreditUse = 0 - EndIf - - - - If Seeker.IntVendingCampaign = 0 Then - VendingQR OFF - If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog.xml" - Else - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - EndIf - EndIf - EndIf - - EndIf - EndIf - EndIf - - - If CancelFlag = 1 Then - - If Seeker.IntVendingCredit > 0 Then - Var BmiYear = Seeker.IntVendingCredit - Var GetScore = "useCredit" - AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore - Var Seeker.IntVendingCredit = 0 - Var Seeker.CurrCreditUse = 0 - EndIf - - Var CancelCounter = CancelCounter + 1 - If CancelCounter = CancelNumber Then - ;Change CoinAmount - If CoinAmount > 0 Then - If Seeker.StoreCreditFlag = 1 Then - Var ChangeOK = 1 - Else - Change CoinAmount - EndIf - - Else - If ActionOKCase = 0 Then - Var ActionOKCase = 1 - Var PayInfoCFlag = 1 - EndIf - - If PressCancel_CashPopup = 1 Then - Var PressCancel_CashPopup = 2 - EndIf - - EndIf - - VendingQR OFF - EndIf - - If CancelCounter >= 43 Then - Var ChangeOK = 1 - EndIf - - ; This copy in file menu_catalog.xml - - If ChangeOK = 1 Then - If ActionOKCase = 0 Then - - If Seeker.TNumberTaobinCredit = "" Then - Var TelephoneNumber = "0899999999" - Var PayO2 = "" - Else - Var TelephoneNumber = Seeker.TNumberTaobinCredit - Var PayO2 = Seeker.CoffeePinNumber - EndIf - - Var VendingDiscount = 0 - Var VendingCampaign = 0 - Var ServiceType = "credit" - Var SessionID2 = SelectDrink - Var ServiceCredit = "coffee" - - Var PayDetail2 = Seeker.PayDetail2 - Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - Var PayCredit = 1 - - Var ActionOKCase = 1 - If Seeker = "curr" Then - If Seeker.IntVendingCampaign = 0 Then - If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog.xml" - Else - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - EndIf - EndIf - Else - ;wait ack - EndIf - EndIf - EndIf - - EndIf - - ;Var CoinInCounter = CoinInCounter + 1 - ;If CoinInOK = 1 Then - ; If CoinInCounter = 3 Then - ; - ; Var RemainAmount = PayAmount - CoinAmount - ; If CoinAmount >= PayAmount Then - ; Var Canout = CoinAmount - PayAmount - ; If Canout > 0 Then - ; Change Canout - ; Else - ; Var ChangeOK = 1 - ; EndIf - ; - ; Var Timeout = 118 - ; Var PayOK = 1 - ; - ; MakeDrinkV1 SelectDrink SelectSugarID - ; - ; Open "ROOT/taobin_project/xml/page_thankyou.xml" - ; - ; EndIf - ; EndIf - ;EndIf - - If CancelingPopupFlag = "Enable" Then - - Var CancelingPopupCountDown = CancelingPopupCountDown + 1 - - DEBUGVAR CancelingPopupCountDown - - If CancelingPopupCountDown > 3 Then - If SendCancelActionFlag = 0 Then - SAVELOG "Send Canceled Popup" - - Var SendCancelActionFlag = 1 - - If QRPopupOpenFlag = 1 Then - VendingQR OFF - EndIf - - If ReqPayInfoFromCashOther = 2 Then - DEBUGVAR "CashlessReq OFF "" by user" - CashlessReq OFF Seeker.CashlessVendingTrackNumber - EndIf - - If CashlessPayFlag = 1 Then - Var CashlessPayFlag = 0 - If KBankCashlessMachine = 1 Then - - Else - CashlessReq CANCEL Seeker.CashlessVendingTrackNumber - EndIf - EndIf - EndIf - EndIf - - If CancelingPopupCountDown > 5 Then - SAVELOG "Close Cancel Popup" - - Var CancelingPopupFlag = "Invisible" - Var alphaState = "Invisible" - Var SendCancelActionFlag = 0 - EndIf - EndIf - - If KBankCashlessMachine = 1 Then - If alphaState = "Enable" Then - If ReqPayInfoFromCashOther = 2 Then - If PopupTimeoutEnable = "Enable" Then - If PopupTimeout > 0 Then - Var PopupTimeout = PopupTimeout - 1 - Else - Var PopupTimeoutEnable = "Invisible" - Var cancelButtonQRPopupState = "Enable" - EndIf - EndIf - EndIf - EndIf - EndIf + Var Timeout = Timeout + 1 Refresh - TimerReset + TimerReset @@ -451,12 +78,12 @@ EndIf + Var ButtonLanguageCurrentXPosition = 1015 + Var ButtonLanguageCurrentYPosition = 458 - 38 + + Var ButtonLanguageListXPosition = 990 + Var ButtonLanguageListYPosition = 450 - 38 Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 990 - Var ButtonLanguageCurrentYPosition = 438 - 38 - - Var ButtonLanguageListXPosition = 970 - Var ButtonLanguageListYPosition = 430 - 38 OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" RefreshAll @@ -478,11 +105,13 @@ Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" Else If BoxID = 210699 Then - DEBUGVAR OpenFromXML + ;DEBUGVAR OpenFromXML ;Open "ROOT/taobin_project/xml/page_payment.xml" - Open OpenFromXML - EndIf - Open "ROOT/taobin_project/xml/page_back_to_main.xml" + ;Open OpenFromXML + OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" + Else + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf EndIf diff --git a/inter/tha/xml/page_help_center_sending.lxml b/inter/tha/xml/page_help_center_sending.lxml index efcd02d9..65077c64 100644 --- a/inter/tha/xml/page_help_center_sending.lxml +++ b/inter/tha/xml/page_help_center_sending.lxml @@ -22,383 +22,31 @@ 1000 - If ReadyForBrew = "false" Then - SAVELOG "Back to main1" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - - EndIf - DEBUGVAR Timeout - DEBUGVAR PayOK - DEBUGVAR ChangeOK - DEBUGVAR CancelFlag + SAVELOG MachineStage - If CreditCardButtonState = "Invisible" Then + Var Timeout = Timeout + 1 - Else - Var X_CASH1 = 216 - 113 - Var X_CASH2 = 439 - 113 - Var X_CASH3 = 664 - 113 - EndIf + If Timeout > 300 Then - - If CamFlag = 1 Then - Var CamCount = CamCount + 1 - If CamCount > 2 Then - facecompare 10 - Var CamFlag = 0 - Var CamCount = 0 - EndIf - EndIf - - - - If AdultState2 = "Enable" Then - Var countAdultS2 = countAdultS2 + 1 - - If countAdultS2 > 60 Then - Var AdultState2 = "Invisible" - Var AdultState3 = "Enable" - EndIf - Else - Var countAdultS2 = 0 - EndIf - - - Var Timeout = Timeout + 1 - - - If Timeout >= 120 Then - Var alphaState = "Invisible" - Var cancelButtonQRPopupState = "Invisible" - Var PopupTimeoutEnable = "Invisible" - Var QRCodeImageState = "Invisible" - - - If RoadShow = "true" Then - Else - Var TaobinCreditButtonState = "Disable" - Var EWalletButtonState = "Disable" - EndIf - - Var LOADING_STATE = "Invisible" - Var QRErrorState = "Invisible" - - EndIf - - - If Timeout > 210 Then - If ActionOKCase = 1 Then - Var PayInfoCFlag = 1 - EndIf - EndIf - - If PayInfoCFlag = 1 Then - If Seeker.CodeChannel = 1 Then - Var SessionID2 = SelectSlot + ":" - Var SessionID2 = SessionID2 + Seeker.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 + Seeker.VendingCode - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + Seeker.CodeNumber - Var ECommerce = ECommerce + "/" - Var ECommerce = ECommerce + "C:" - Var ECommerce = ECommerce + Seeker.IntVendingCampaign - 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 - EndIf - If Seeker = "curr" Then - If PressCancel_CashPopup = 2 Then - Open "ROOT/taobin_project/xml/page_payment.xml" - EndIf - Open "ROOT/taobin_project/xml/page_catalog.xml" + If MachineStage = "remove-cup" Then + Open "ROOT/taobin_project/xml/page_drinkfail3.xml" Else + If NextOrder = "true" Then + Var NextOrder = "false" - If PressCancel_CashPopup = 2 Then - Open "ROOT/taobin_project/xml/page_payment.xml" - EndIf - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - EndIf - EndIf + TransferVar "next" "curr" + Var Seeker = "curr" - - If TestLoopMakeDrink = 1 Then - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" - EndIf - - - - If CoinInOK = 1 Then - Var CoinInCounter = CoinInCounter + 1 - If CoinInCounter = 1 Then - - SAVELOG "CoinInOk OK" - - ;Var ChangeOK = 1 - Var Timeout = 180 - Var PayOK = 1 - - EndIf - EndIf - - Var stringLog = "Timeout " + Timeout - Var stringLog = stringLog + " PayOK" - Var stringLog = stringLog + PayOK - - - If Timeout > 180 Then - If PayOK = 1 Then - - If Seeker = "curr" Then - - If New_Payment = 1 Then - __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID - EndIf - MakeDrinkV1 SelectDrink SelectSugarID - Var TxRef1 = "" - CreateTxRef1 TxRef1 + Open "ROOT/taobin_project/xml/page_thankyouConti.xml" Else - Var TxRef1 = "" - CreateTxRef1 TxRef1 - Var DrinkPaid = SelectDrink - Var PaidPaymentFromNextStage = 1 - - EndIf - - Open "ROOT/taobin_project/xml/page_thankyou.xml" - - Else - If CancelFlag = 0 Then - SAVELOG "Timeout > 180 s." - - If ViewBill > 0 Then - CoinVending BILLREJECT - EndIf - - CoinVending OFF - Var CancelFlag = 1 - Var cancelState = "Enable" - - If CashlessPayFlag = 1 Then - Var CashlessPayFlag = 0 - If KBankCashlessMachine = 1 Then - - Else - CashlessReq CANCEL Seeker.CashlessVendingTrackNumber - EndIf - EndIf - - Var CancelCounter = 0 - If CoinAmount = 0 Then - - If Seeker.IntVendingCredit > 0 Then - Var BmiYear = Seeker.IntVendingCredit - Var GetScore = "useCredit" - AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore - Var Seeker.IntVendingCredit = 0 - Var Seeker.CurrCreditUse = 0 - EndIf - - - - If Seeker.IntVendingCampaign = 0 Then - VendingQR OFF - If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog.xml" - Else - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - EndIf - EndIf - EndIf - - EndIf - EndIf - EndIf - - - If CancelFlag = 1 Then - - If Seeker.IntVendingCredit > 0 Then - Var BmiYear = Seeker.IntVendingCredit - Var GetScore = "useCredit" - AddData 24 Seeker.TNumberTaobinCredit BmiYear PointCrm GetScore - Var Seeker.IntVendingCredit = 0 - Var Seeker.CurrCreditUse = 0 - EndIf - - Var CancelCounter = CancelCounter + 1 - If CancelCounter = CancelNumber Then - ;Change CoinAmount - If CoinAmount > 0 Then - If Seeker.StoreCreditFlag = 1 Then - Var ChangeOK = 1 - Else - Change CoinAmount - EndIf - - Else - If ActionOKCase = 0 Then - Var ActionOKCase = 1 - Var PayInfoCFlag = 1 - EndIf - - If PressCancel_CashPopup = 1 Then - Var PressCancel_CashPopup = 2 - EndIf - - EndIf - - VendingQR OFF - EndIf - - If CancelCounter >= 43 Then - Var ChangeOK = 1 - EndIf - - ; This copy in file menu_catalog.xml - - If ChangeOK = 1 Then - If ActionOKCase = 0 Then - - If Seeker.TNumberTaobinCredit = "" Then - Var TelephoneNumber = "0899999999" - Var PayO2 = "" - Else - Var TelephoneNumber = Seeker.TNumberTaobinCredit - Var PayO2 = Seeker.CoffeePinNumber - EndIf - - Var VendingDiscount = 0 - Var VendingCampaign = 0 - Var ServiceType = "credit" - Var SessionID2 = SelectDrink - Var ServiceCredit = "coffee" - - Var PayDetail2 = Seeker.PayDetail2 - Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - Var PayCredit = 1 - - Var ActionOKCase = 1 - If Seeker = "curr" Then - If Seeker.IntVendingCampaign = 0 Then - If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog.xml" - Else - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - EndIf - EndIf - Else - ;wait ack - EndIf - EndIf - EndIf - - EndIf - - ;Var CoinInCounter = CoinInCounter + 1 - ;If CoinInOK = 1 Then - ; If CoinInCounter = 3 Then - ; - ; Var RemainAmount = PayAmount - CoinAmount - ; If CoinAmount >= PayAmount Then - ; Var Canout = CoinAmount - PayAmount - ; If Canout > 0 Then - ; Change Canout - ; Else - ; Var ChangeOK = 1 - ; EndIf - ; - ; Var Timeout = 118 - ; Var PayOK = 1 - ; - ; MakeDrinkV1 SelectDrink SelectSugarID - ; - ; Open "ROOT/taobin_project/xml/page_thankyou.xml" - ; - ; EndIf - ; EndIf - ;EndIf - - If CancelingPopupFlag = "Enable" Then - - Var CancelingPopupCountDown = CancelingPopupCountDown + 1 - - DEBUGVAR CancelingPopupCountDown - - If CancelingPopupCountDown > 3 Then - If SendCancelActionFlag = 0 Then - SAVELOG "Send Canceled Popup" - - Var SendCancelActionFlag = 1 - - If QRPopupOpenFlag = 1 Then - VendingQR OFF - EndIf - - If ReqPayInfoFromCashOther = 2 Then - DEBUGVAR "CashlessReq OFF "" by user" - CashlessReq OFF Seeker.CashlessVendingTrackNumber - EndIf - - If CashlessPayFlag = 1 Then - Var CashlessPayFlag = 0 - If KBankCashlessMachine = 1 Then - - Else - CashlessReq CANCEL Seeker.CashlessVendingTrackNumber - EndIf - EndIf - EndIf - EndIf - - If CancelingPopupCountDown > 5 Then - SAVELOG "Close Cancel Popup" - - Var CancelingPopupFlag = "Invisible" - Var alphaState = "Invisible" - Var SendCancelActionFlag = 0 - EndIf - EndIf - - If KBankCashlessMachine = 1 Then - If alphaState = "Enable" Then - If ReqPayInfoFromCashOther = 2 Then - If PopupTimeoutEnable = "Enable" Then - If PopupTimeout > 0 Then - Var PopupTimeout = PopupTimeout - 1 - Else - Var PopupTimeoutEnable = "Invisible" - Var cancelButtonQRPopupState = "Enable" - EndIf - EndIf + ;Open "ROOT/taobin_project/xml/page_back_to_main.xml" + OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" EndIf EndIf EndIf - Refresh - TimerReset + TimerReset @@ -423,6 +71,12 @@ EndIf + Var ButtonLanguageCurrentXPosition = 1015 + Var ButtonLanguageCurrentYPosition = 458 - 38 + + Var ButtonLanguageListXPosition = 990 + Var ButtonLanguageListYPosition = 450 - 38 + Var LanguageButtonEnable = "Enable" OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" RefreshAll diff --git a/inter/tha/xml/page_instance_empty.lxml b/inter/tha/xml/page_instance_empty.lxml index 269f878d..ce901da8 100644 --- a/inter/tha/xml/page_instance_empty.lxml +++ b/inter/tha/xml/page_instance_empty.lxml @@ -3,9 +3,11 @@ 1920 - - - RootLayoutVisible 3 "show" + If EnableBtnLangWithHelper = 1 Then + RootLayoutVisible 3 "show" + Else + RootLayoutVisible 3 "hide" + EndIf RootLayoutVisible 13 "hide" ;OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" @@ -34,5 +36,27 @@ TimerReset + + + If OpenFromPageBoard = 1 Then + Var OpenFromPageBoard = 0 + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 608 + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 590 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + Else + Var ButtonLanguageCurrentXPosition = 1015 + Var ButtonLanguageCurrentYPosition = 458 - 38 + + Var ButtonLanguageListXPosition = 990 + Var ButtonLanguageListYPosition = 450 - 38 + Var LanguageButtonEnable = "Enable" + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + EndIf + + RefreshAll + diff --git a/inter/tha/xml/page_payment_pack_and_send.xml b/inter/tha/xml/page_payment_pack_and_send.xml index 7ea36e81..dba0b7ce 100644 --- a/inter/tha/xml/page_payment_pack_and_send.xml +++ b/inter/tha/xml/page_payment_pack_and_send.xml @@ -54,8 +54,8 @@ Var Seeker.PictureDrink = "" Var Seeker.CollectPointMain = 1 - Open "ROOT/taobin_project/xml/page_payment.xml" - ;Open "ROOT/taobin_project/xml/page_thankyou.xml" + ;Open "ROOT/taobin_project/xml/page_payment.xml" + Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf diff --git a/inter/tha/xml/page_smoothie_suggest_and_process.xml b/inter/tha/xml/page_smoothie_suggest_and_process.xml index 9d2d5752..2a6cb49b 100644 --- a/inter/tha/xml/page_smoothie_suggest_and_process.xml +++ b/inter/tha/xml/page_smoothie_suggest_and_process.xml @@ -67,6 +67,7 @@ Var Show_btn_process = "Enable" Var Showhelper = "Invisible" + Var EnableBtnLangWithHelper = 1 Var VideoSmoothieProcess = "ROOT/taobin_project/animation01/Taobin_empty.mp4" @@ -356,7 +357,7 @@ Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml" OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - Open "ROOT/taobin_project/inter/tha/xml/page_help_center.lxml" + OpenInst 15 "ROOT/taobin_project/inter/tha/xml/page_help_center.lxml" diff --git a/inter/tha/xml/page_smoothie_suggest_and_process_2.xml b/inter/tha/xml/page_smoothie_suggest_and_process_2.xml index 0207e720..26c80d58 100644 --- a/inter/tha/xml/page_smoothie_suggest_and_process_2.xml +++ b/inter/tha/xml/page_smoothie_suggest_and_process_2.xml @@ -24,20 +24,6 @@ TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/ticket_time_blending.ev" - DEBUGVAR OpenFromPageBoard - If OpenFromPageBoard = 1 Then - Var OpenFromPageBoard = 0 - Var langnext1 = "true" - Var langnext2 = "true" - Var langnext3 = "true" - Var langnext4 = "true" - Var langnext5 = "true" - Var langnext6 = "true" - Var langnext7 = "true" - Var langnext8 = "true" - Var langnext9 = "true" - EndIf - Var NextPage = "-" @@ -194,7 +180,7 @@ Menu "set-image" Seeker.PictureDrink - ;Open "ROOT/taobin_project/inter/tha/xml/page_payment_pack_and_send.xml" + Open "ROOT/taobin_project/inter/tha/xml/page_payment_pack_and_send.xml" EndIf diff --git a/inter/tha/xml/page_smoothie_suggest_and_process_3.xml b/inter/tha/xml/page_smoothie_suggest_and_process_3.xml index 46ccb999..5f30d8c1 100644 --- a/inter/tha/xml/page_smoothie_suggest_and_process_3.xml +++ b/inter/tha/xml/page_smoothie_suggest_and_process_3.xml @@ -22,20 +22,6 @@ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/sometime/campaign_sound.ev" - DEBUGVAR OpenFromPageBoard - If OpenFromPageBoard = 1 Then - Var OpenFromPageBoard = 0 - Var langnext1 = "true" - Var langnext2 = "true" - Var langnext3 = "true" - Var langnext4 = "true" - Var langnext5 = "true" - Var langnext6 = "true" - Var langnext7 = "true" - Var langnext8 = "true" - Var langnext9 = "true" - EndIf - Var NextPage = "-" @@ -56,6 +42,7 @@ Var ProcessCupDebugText = "" Var TimeOutSmoothiesProcess = 0 + Var Timeout = 0 DEBUGVAR TimeOutSmoothiesProcess @@ -84,6 +71,12 @@ DEBUGVAR AnyArmConfuse DEBUGVAR SensorDoorCupStatus + DEBUGVAR Timeout + + If Timeout > 66 Then + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf If CH9992_Status = "READY" Then @@ -157,7 +150,8 @@ ;Open "ROOT/taobin_project/inter/tha/xml/page_payment_pack_and_send.xml" EndIf - + + Var Timeout = Timeout + 1 Refresh TimerReset diff --git a/xml/page_NewBrewing3.xml b/xml/page_NewBrewing3.xml index aa53ad3c..e4622cc0 100644 --- a/xml/page_NewBrewing3.xml +++ b/xml/page_NewBrewing3.xml @@ -284,8 +284,13 @@ If MachineState_Result > 0 Then Var SelectMenuBetweenBrewEnable1 = "Invisible" Else - Var SelectMenuBetweenBrewEnable1 = "Enable" - Var EnableTopupCreditBetweenBrew = "Enable" + If SmoothieToPayment = 1 Then + Var SelectMenuBetweenBrewEnable1 = "Invisible" + Var SmoothieToPayment = 0 + Else + Var SelectMenuBetweenBrewEnable1 = "Enable" + Var EnableTopupCreditBetweenBrew = "Enable" + EndIf EndIf If GetFreeFromError = 1 Then @@ -1140,7 +1145,7 @@ Else Var SelectMenuBetweenBrewEnable1Blink = "Invisible" - + Var SelectMenuBetweenBrewEnable1Text = "Invisible" EndIf DEBUGVAR CountUpBrewing diff --git a/xml/page_board.xml b/xml/page_board.xml index 8ceafa97..d603dfd1 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -1318,6 +1318,7 @@ If CountryName = "Thailand" Then ; enable btn_change_langs + Var EnableBtnLangWithHelper = 1 Var LanguageButtonEnable = "Enable" Var ButtonLanguageCurrentXPosition = 990 Var ButtonLanguageCurrentYPosition = 608 @@ -1364,6 +1365,12 @@ Var InternationalShow = 1 EndIf + If BoxID = 105005 Then + Var SpiralOnline = "true" + Var SpiralModeFrozenFruit = 1 + Var InternationalShow = 1 + EndIf + ; test payment Var New_Payment = 1 diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 23ffbe6d..cd3711a9 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -384,8 +384,13 @@ If MachineState_Result > 0 Then Var SelectMenuBetweenBrewEnable1 = "Invisible" Else - Var SelectMenuBetweenBrewEnable1 = "Enable" - Var EnableTopupCreditBetweenBrew = "Enable" + If SmoothieToPayment = 1 Then + Var SelectMenuBetweenBrewEnable1 = "Invisible" + Var SmoothieToPayment = 0 + Else + Var SelectMenuBetweenBrewEnable1 = "Enable" + Var EnableTopupCreditBetweenBrew = "Enable" + EndIf EndIf If GetFreeFromError = 1 Then @@ -1505,6 +1510,7 @@ Else Var SelectMenuBetweenBrewEnable1Blink = "Invisible" + Var SelectMenuBetweenBrewEnable1Text = "Invisible" EndIf DEBUGVAR CountUpBrewing diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 48038fed..01ec176c 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -1306,6 +1306,7 @@ Var X_CASH3 = 664 - 113 EndIf + ; helper Var FromSmoothieProcess = "Invisible" Var FromPaymentCash = "Enable" Var FromBrewingProcess = "Invisible" @@ -1316,6 +1317,9 @@ Var Showhelper = "Invisible" EndIf + ; langs + Var EnableBtnLangWithHelper = 0 + diff --git a/xml/page_spiral_sell.xml b/xml/page_spiral_sell.xml index 242e9050..3be1aad1 100644 --- a/xml/page_spiral_sell.xml +++ b/xml/page_spiral_sell.xml @@ -14,8 +14,8 @@ Var ServiceCredit = "03-02-00-6001" SPIRAL_SELL ServiceCredit SpiralRef - Var SmoothieToPayment = 0 Var TimeOutSmoothiesProcess = 120 + DEBUGVAR SmoothieToPayment 1000 @@ -98,6 +98,14 @@ EndIf EndIf + If BoxID = 105005 Then + If Timeout > 10 Then + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml" + ;Open "ROOT/taobin_project/xml/page_spiral_failed.xml" + EndIf + EndIf + If Timeout > 120 Then Open "ROOT/taobin_project/xml/page_back_to_failed.xml" EndIf