diff --git a/animation01/Taobin_empty.mp4 b/animation01/Taobin_empty.mp4 new file mode 100644 index 00000000..0d166889 Binary files /dev/null and b/animation01/Taobin_empty.mp4 differ diff --git a/animation01/Taobin_pause_art41.mp4 b/animation01/Taobin_pause_art41.mp4 new file mode 100644 index 00000000..6a5da2a1 Binary files /dev/null and b/animation01/Taobin_pause_art41.mp4 differ diff --git a/image/page_help_center/Group.png b/image/page_help_center/Group.png new file mode 100644 index 00000000..8aaa2ac9 Binary files /dev/null and b/image/page_help_center/Group.png differ diff --git a/image/page_help_center/bn_0.png b/image/page_help_center/bn_0.png new file mode 100644 index 00000000..1f9a01eb Binary files /dev/null and b/image/page_help_center/bn_0.png differ diff --git a/image/page_help_center/bn_1.png b/image/page_help_center/bn_1.png new file mode 100644 index 00000000..d5d5c68a Binary files /dev/null and b/image/page_help_center/bn_1.png differ diff --git a/image/page_help_center/bn_2.png b/image/page_help_center/bn_2.png new file mode 100644 index 00000000..6759f7aa Binary files /dev/null and b/image/page_help_center/bn_2.png differ diff --git a/image/page_help_center/bn_3.png b/image/page_help_center/bn_3.png new file mode 100644 index 00000000..c83aefe4 Binary files /dev/null and b/image/page_help_center/bn_3.png differ diff --git a/image/page_help_center/bn_4.png b/image/page_help_center/bn_4.png new file mode 100644 index 00000000..e905b7a7 Binary files /dev/null and b/image/page_help_center/bn_4.png differ diff --git a/image/page_help_center/bn_5.png b/image/page_help_center/bn_5.png new file mode 100644 index 00000000..c5ca4def Binary files /dev/null and b/image/page_help_center/bn_5.png differ diff --git a/image/page_help_center/bn_6.png b/image/page_help_center/bn_6.png new file mode 100644 index 00000000..fcb10901 Binary files /dev/null and b/image/page_help_center/bn_6.png differ diff --git a/image/page_help_center/bn_7.png b/image/page_help_center/bn_7.png new file mode 100644 index 00000000..729c73c7 Binary files /dev/null and b/image/page_help_center/bn_7.png differ diff --git a/image/page_help_center/bn_8.png b/image/page_help_center/bn_8.png new file mode 100644 index 00000000..5239883c Binary files /dev/null and b/image/page_help_center/bn_8.png differ diff --git a/image/page_help_center/bn_9.png b/image/page_help_center/bn_9.png new file mode 100644 index 00000000..8814ad66 Binary files /dev/null and b/image/page_help_center/bn_9.png differ diff --git a/image/page_help_center/bn_accept_help.png b/image/page_help_center/bn_accept_help.png new file mode 100644 index 00000000..6a004c58 Binary files /dev/null and b/image/page_help_center/bn_accept_help.png differ diff --git a/image/page_help_center/bn_back-1.png b/image/page_help_center/bn_back-1.png new file mode 100644 index 00000000..0807557b Binary files /dev/null and b/image/page_help_center/bn_back-1.png differ diff --git a/image/page_help_center/bn_back_to_help.png b/image/page_help_center/bn_back_to_help.png new file mode 100644 index 00000000..31626836 Binary files /dev/null and b/image/page_help_center/bn_back_to_help.png differ diff --git a/image/page_help_center/bn_next_help.png b/image/page_help_center/bn_next_help.png new file mode 100644 index 00000000..869ba52e Binary files /dev/null and b/image/page_help_center/bn_next_help.png differ diff --git a/image/page_help_center/bp_0.png b/image/page_help_center/bp_0.png new file mode 100644 index 00000000..59755e71 Binary files /dev/null and b/image/page_help_center/bp_0.png differ diff --git a/image/page_help_center/bp_1.png b/image/page_help_center/bp_1.png new file mode 100644 index 00000000..54b9f3e6 Binary files /dev/null and b/image/page_help_center/bp_1.png differ diff --git a/image/page_help_center/bp_2.png b/image/page_help_center/bp_2.png new file mode 100644 index 00000000..3c08c533 Binary files /dev/null and b/image/page_help_center/bp_2.png differ diff --git a/image/page_help_center/bp_3.png b/image/page_help_center/bp_3.png new file mode 100644 index 00000000..65e71f62 Binary files /dev/null and b/image/page_help_center/bp_3.png differ diff --git a/image/page_help_center/bp_4.png b/image/page_help_center/bp_4.png new file mode 100644 index 00000000..2a23b054 Binary files /dev/null and b/image/page_help_center/bp_4.png differ diff --git a/image/page_help_center/bp_5.png b/image/page_help_center/bp_5.png new file mode 100644 index 00000000..d2069529 Binary files /dev/null and b/image/page_help_center/bp_5.png differ diff --git a/image/page_help_center/bp_6.png b/image/page_help_center/bp_6.png new file mode 100644 index 00000000..7f2066b8 Binary files /dev/null and b/image/page_help_center/bp_6.png differ diff --git a/image/page_help_center/bp_7.png b/image/page_help_center/bp_7.png new file mode 100644 index 00000000..658d4416 Binary files /dev/null and b/image/page_help_center/bp_7.png differ diff --git a/image/page_help_center/bp_8.png b/image/page_help_center/bp_8.png new file mode 100644 index 00000000..69f93b01 Binary files /dev/null and b/image/page_help_center/bp_8.png differ diff --git a/image/page_help_center/bp_9.png b/image/page_help_center/bp_9.png new file mode 100644 index 00000000..b71fc059 Binary files /dev/null and b/image/page_help_center/bp_9.png differ diff --git a/image/page_help_center/bp_accept_help.png b/image/page_help_center/bp_accept_help.png new file mode 100644 index 00000000..31626836 Binary files /dev/null and b/image/page_help_center/bp_accept_help.png differ diff --git a/image/page_help_center/bp_back-1.png b/image/page_help_center/bp_back-1.png new file mode 100644 index 00000000..550285bc Binary files /dev/null and b/image/page_help_center/bp_back-1.png differ diff --git a/image/page_help_center/bp_back_to_help.png b/image/page_help_center/bp_back_to_help.png new file mode 100644 index 00000000..ddae1a66 Binary files /dev/null and b/image/page_help_center/bp_back_to_help.png differ diff --git a/image/page_help_center/bp_next_help.png b/image/page_help_center/bp_next_help.png new file mode 100644 index 00000000..71da6102 Binary files /dev/null and b/image/page_help_center/bp_next_help.png differ diff --git a/image/page_help_center/cb_checked_problem.png b/image/page_help_center/cb_checked_problem.png new file mode 100644 index 00000000..ade7ab5f Binary files /dev/null and b/image/page_help_center/cb_checked_problem.png differ diff --git a/image/page_help_center/cb_uncheck_problem.png b/image/page_help_center/cb_uncheck_problem.png new file mode 100644 index 00000000..cef140f5 Binary files /dev/null and b/image/page_help_center/cb_uncheck_problem.png differ diff --git a/image/page_help_center/help_lead.png b/image/page_help_center/help_lead.png new file mode 100644 index 00000000..5cc1de67 Binary files /dev/null and b/image/page_help_center/help_lead.png differ diff --git a/image/page_help_center/helper.png b/image/page_help_center/helper.png new file mode 100644 index 00000000..5e61a2da Binary files /dev/null and b/image/page_help_center/helper.png differ diff --git a/image/page_help_center/img3.png b/image/page_help_center/img3.png new file mode 100644 index 00000000..3fcbcc41 Binary files /dev/null and b/image/page_help_center/img3.png differ diff --git a/image/page_help_center/text15.png b/image/page_help_center/text15.png new file mode 100644 index 00000000..c00a9731 Binary files /dev/null and b/image/page_help_center/text15.png differ diff --git a/image/page_payment/helper.png b/image/page_payment/helper.png new file mode 100644 index 00000000..07b86b30 Binary files /dev/null and b/image/page_payment/helper.png differ diff --git a/image/smoothie/proccess/bd_get_blend.png b/image/smoothie/proccess/bd_get_blend.png new file mode 100644 index 00000000..aa1037d9 Binary files /dev/null and b/image/smoothie/proccess/bd_get_blend.png differ diff --git a/image/smoothie/proccess/bn_back_smoothie.png b/image/smoothie/proccess/bn_back_smoothie.png new file mode 100644 index 00000000..61d3725b Binary files /dev/null and b/image/smoothie/proccess/bn_back_smoothie.png differ diff --git a/image/smoothie/proccess/bn_cancel_smoothie.png b/image/smoothie/proccess/bn_cancel_smoothie.png new file mode 100644 index 00000000..71da6102 Binary files /dev/null and b/image/smoothie/proccess/bn_cancel_smoothie.png differ diff --git a/image/smoothie/proccess/bn_cancel_smoothie_2.png b/image/smoothie/proccess/bn_cancel_smoothie_2.png new file mode 100644 index 00000000..869ba52e Binary files /dev/null and b/image/smoothie/proccess/bn_cancel_smoothie_2.png differ diff --git a/image/smoothie/proccess/bn_get_blend.png b/image/smoothie/proccess/bn_get_blend.png new file mode 100644 index 00000000..2700e645 Binary files /dev/null and b/image/smoothie/proccess/bn_get_blend.png differ diff --git a/image/smoothie/proccess/bp_back_smoothie.png b/image/smoothie/proccess/bp_back_smoothie.png new file mode 100644 index 00000000..a2ee36b1 Binary files /dev/null and b/image/smoothie/proccess/bp_back_smoothie.png differ diff --git a/image/smoothie/proccess/bp_cancel_smoothie.png b/image/smoothie/proccess/bp_cancel_smoothie.png new file mode 100644 index 00000000..86fb9c3e Binary files /dev/null and b/image/smoothie/proccess/bp_cancel_smoothie.png differ diff --git a/image/smoothie/proccess/bp_get_blend.png b/image/smoothie/proccess/bp_get_blend.png new file mode 100644 index 00000000..f31fd8e1 Binary files /dev/null and b/image/smoothie/proccess/bp_get_blend.png differ diff --git a/image/smoothie/proccess/clock.png b/image/smoothie/proccess/clock.png new file mode 100644 index 00000000..1e918b05 Binary files /dev/null and b/image/smoothie/proccess/clock.png differ diff --git a/image/smoothie/proccess/hand_point.png b/image/smoothie/proccess/hand_point.png new file mode 100644 index 00000000..1f8f3f70 Binary files /dev/null and b/image/smoothie/proccess/hand_point.png differ diff --git a/image/smoothie/proccess/second.png b/image/smoothie/proccess/second.png new file mode 100644 index 00000000..7366ce2c Binary files /dev/null and b/image/smoothie/proccess/second.png differ diff --git a/image/topping_inter/bn_next2.png b/image/topping_inter/bn_next2.png new file mode 100644 index 00000000..92d11a0a Binary files /dev/null and b/image/topping_inter/bn_next2.png differ diff --git a/image/topping_inter/bp_next2.png b/image/topping_inter/bp_next2.png new file mode 100644 index 00000000..64f4bd39 Binary files /dev/null and b/image/topping_inter/bp_next2.png differ diff --git a/image/topping_inter/time.png b/image/topping_inter/time.png new file mode 100644 index 00000000..59cbcc36 Binary files /dev/null and b/image/topping_inter/time.png differ diff --git a/inter/tha/configure.ev b/inter/tha/configure.ev index 4b33f02a..ba85bdc8 100644 --- a/inter/tha/configure.ev +++ b/inter/tha/configure.ev @@ -26,4 +26,9 @@ If BoxID = 201729 Then Var EnableMultiInstanceFromBoxID = 1 EndIf + + If BoxID = 210699 Then + Var EnableMultiInstanceFromBoxID = 1 + EndIf + \ No newline at end of file diff --git a/inter/tha/xml/helper_show_and_refresh.lxml b/inter/tha/xml/helper_show_and_refresh.lxml new file mode 100644 index 00000000..fc5ebb0d --- /dev/null +++ b/inter/tha/xml/helper_show_and_refresh.lxml @@ -0,0 +1,2 @@ +OpenInst 15 "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml" +RootLayoutVisible 15 "show" \ No newline at end of file diff --git a/inter/tha/xml/multi/control_and_lang_swith.ev b/inter/tha/xml/multi/control_and_lang_swith.ev index d4810894..24e8cec4 100644 --- a/inter/tha/xml/multi/control_and_lang_swith.ev +++ b/inter/tha/xml/multi/control_and_lang_swith.ev @@ -79,7 +79,7 @@ Var InstanceTabOpenFile9 = InstanceTabOpenFile9 + "/page_catalog_group_frozen_fr Var InstanceTabOpenFile11 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml" -Var InstanceTabOpenFile12 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml" +Var InstanceTabOpenFile12 = "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml" Var InstanceTabOpenFile10 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml" Var InstanceTabOpenFile13 = "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml" diff --git a/inter/tha/xml/multi/page_catalog.lxml b/inter/tha/xml/multi/page_catalog.lxml index ce62a325..f9fa7088 100644 --- a/inter/tha/xml/multi/page_catalog.lxml +++ b/inter/tha/xml/multi/page_catalog.lxml @@ -12,6 +12,9 @@ TopView "show" ; On open + ; helper + RootLayoutVisible 15 "hide" + Machine WakeUp ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" diff --git a/inter/tha/xml/page_help_center.lxml b/inter/tha/xml/page_help_center.lxml new file mode 100644 index 00000000..4c590ea9 --- /dev/null +++ b/inter/tha/xml/page_help_center.lxml @@ -0,0 +1,1087 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + SAVELOG "======================================= Help Center ================================" + + RootLayoutVisible 3 "show" + RootLayoutVisible 13 "hide" + + ; helper + RootLayoutVisible 15 "show" + + DEBUGVAR FromPaymentCash + DEBUGVAR FromSmoothieProcess + DEBUGVAR FromBrewingProcess + + Var show_btn_next_help = "Invisible" + + Var Problem_Cash_State[0] = "Enable" + Var Problem_Cash_State[1] = "Enable" + Var Problem_Cash_State[2] = "Enable" + + Var Problem_Brewing_State[0] = "Enable" + Var Problem_Brewing_State[1] = "Enable" + Var Problem_Brewing_State[2] = "Enable" + Var Problem_Brewing_State[3] = "Enable" + Var Problem_Brewing_State[4] = "Enable" + Var Problem_Brewing_State[5] = "Enable" + Var Problem_Brewing_State[6] = "Enable" + Var Problem_Brewing_State[7] = "Enable" + Var Problem_Brewing_State[8] = "Enable" + + Var Problem_Process_State[0] = "Enable" + Var Problem_Process_State[1] = "Enable" + + + + + + 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 + + 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 + + Refresh + TimerReset + + + + DEBUGVAR LanguageShow + + ;inter-image + If LanguageShow = "ENG" Then + + EndIf + + If LanguageShow = "THAI" Then + + EndIf + + If LanguageShow = "MYANMAR" Then + + EndIf + + + If LanguageShow = "MSC" Then + + EndIf + + 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 + + + +; back + + + + 300 + 420 + 500 + 72 + + 002300 + + + + + 115 + 550 + 500 + 46 + + 002299 + + + + + 110 + 620 + 1080 + 1080 + 1080 + "Vertical" + 1 + + + "Enable" + 1080 + "auto" + 20 + + + 986 + "auto" + "vertical" + "Enable" + +;for FromPaymentCash + + 986 + "auto" + FromPaymentCash + + + + + + + + + 100 + 0 + 500 + 75 + Problem_Cash_State[0] + + 002301 + + + + + 100 + 100 + 500 + 75 + Problem_Cash_State[1] + + 002302 + + + + + 100 + 200 + 500 + 75 + Problem_Cash_State[2] + + 002303 + + + + + +; for FromBrewingProcess + + 986 + "auto" + FromBrewingProcess + + + + + + + + + + + + + + + + + + + + + 100 + 0 + 500 + 75 + Problem_Brewing_State[0] + + 002304 + + + + + 100 + 100 + 500 + 75 + Problem_Brewing_State[1] + + 002305 + + + + + 100 + 200 + 500 + 75 + Problem_Brewing_State[2] + + 002306 + + + + + 100 + 300 + 500 + 75 + Problem_Brewing_State[3] + + 002307 + + + + + 100 + 400 + 500 + 75 + Problem_Brewing_State[4] + + 002308 + + + + + 100 + 500 + 500 + 75 + Problem_Brewing_State[5] + + 002309 + + + + + 100 + 600 + 500 + 75 + Problem_Brewing_State[6] + + 002310 + + + + + 100 + 700 + 500 + 75 + Problem_Brewing_State[7] + + 002311 + + + + + 100 + 800 + 500 + 75 + Problem_Brewing_State[8] + + 002303 + + + + +; FromSmoothieProcess + + 986 + "auto" + FromSmoothieProcess + + + + + + + 100 + 0 + 500 + 75 + Problem_Process_State[0] + + 002312 + + + + + 100 + 100 + 500 + 75 + Problem_Process_State[1] + + 002303 + + + + + + + + + + + +; next + + + 300 + 1715 + show_btn_next_help + 500 + 75 + + 0 + 0 + 002350 + + + + + + + + diff --git a/inter/tha/xml/page_help_center_sending.lxml b/inter/tha/xml/page_help_center_sending.lxml new file mode 100644 index 00000000..efcd02d9 --- /dev/null +++ b/inter/tha/xml/page_help_center_sending.lxml @@ -0,0 +1,899 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + SAVELOG "======================================= Help Center ================================" + + RootLayoutVisible 3 "show" + + Var Timeout = 0 + + Var TelephoneNumber = "" + + Var ShowTextNumber = "Enable" + Var ShowErrorText = "Invisible" + Var ShowErrorText2 = "Invisible" + Var Tel_Confirm_State = "Invisible" + + + 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 + + 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 + + Refresh + TimerReset + + + + DEBUGVAR LanguageShow + + ;inter-image + If LanguageShow = "ENG" Then + + EndIf + + If LanguageShow = "THAI" Then + + EndIf + + If LanguageShow = "MYANMAR" Then + + EndIf + + + If LanguageShow = "MSC" Then + + EndIf + + + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + RefreshAll + + + +; back + + + + 300 + 420 + 500 + 72 + + 002300 + + + +; helper + + 440 + 552 + 210 + 311 + "ROOT/taobin_project/image/page_help_center/helper.png" + + + + 0 + 900 + + 002353 + + + + + 257 + 1035 + "ROOT/taobin_project/image/page_help_center/img3.png" + + + + 399 + 1080 + ShowTextNumber + "Enable" + "ROOT/taobin_project/image/page_help_center/text15.png" + + + + 298 + 1055 + ShowTextNumber + "Enable" + "ROOT/taobin_project/image/page_help_center/Group.png" + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 1060 + 1080 + Center + 48 + RobotoBlack + 0x513C2F + "Enable" + TelephoneNumber + Telnum-mask-1 + + +; confirm next + + + 585 + 1765 + Tel_Confirm_State + 500 + 75 + + 0 + 0 + 002352 + + + + + + 115 + 1765 + 250 + 75 + + 0 + 0 + 002351 + + + + + + + + + diff --git a/inter/tha/xml/page_instance_empty.lxml b/inter/tha/xml/page_instance_empty.lxml new file mode 100644 index 00000000..269f878d --- /dev/null +++ b/inter/tha/xml/page_instance_empty.lxml @@ -0,0 +1,38 @@ + + 1080 + 1920 + + + + + RootLayoutVisible 3 "show" + RootLayoutVisible 13 "hide" + + ;OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" + + Var Timeout = 0 + + + 1000 + + + DEBUGVAR Timeout + If Timeout > 66 Then + SAVELOG "Timeout" + + TabMenuVisibleInst 99 + + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + SAVELOG "Back" + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + Var Timeout = Timeout + 1 + + TimerReset + + + + diff --git a/inter/tha/xml/page_payment_pack_and_send.xml b/inter/tha/xml/page_payment_pack_and_send.xml index 60dee73e..7ea36e81 100644 --- a/inter/tha/xml/page_payment_pack_and_send.xml +++ b/inter/tha/xml/page_payment_pack_and_send.xml @@ -55,7 +55,7 @@ Var Seeker.CollectPointMain = 1 Open "ROOT/taobin_project/xml/page_payment.xml" - + ;Open "ROOT/taobin_project/xml/page_thankyou.xml" EndIf @@ -69,45 +69,46 @@ - - - 0 - 1337 - 1080 - 85 - Center - - 1201 - - +; +; 0 +; 1337 +; 1080 +; 85 +; Center +; + ; 1201 +; +; 0 - 1571 + 1451 1080 85 Center @@ -116,4 +117,23 @@ +; second time + + "Enable" + CountDown_x + 1540 + 72 + RobotoBold + 0xFFFFFF + TimeOutSmoothiesProcess + + + "Enable" + Second_x + 1560 + 52 + RobotoBold + 0xFFFFFF + "S" + diff --git a/inter/tha/xml/page_smoothie_suggest_and_process.xml b/inter/tha/xml/page_smoothie_suggest_and_process.xml index b8a4539e..9d2d5752 100644 --- a/inter/tha/xml/page_smoothie_suggest_and_process.xml +++ b/inter/tha/xml/page_smoothie_suggest_and_process.xml @@ -14,12 +14,16 @@ Machine WakeUp + RootLayoutVisible 3 "show" + ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" DEBUGVAR ToppingNewShow TRY "/mnt/sdcard/coffeevending/taobin_project/xml/sometime/campaign_sound.ev" + TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/ticket_time_blending.ev" + DEBUGVAR OpenFromPageBoard If OpenFromPageBoard = 1 Then Var OpenFromPageBoard = 0 @@ -52,7 +56,30 @@ Var ProcessCupDebugText = "" - Var TimeOutSmoothiesProcess = 120 + + Var FromSmoothieProcess = "Enable" + Var FromPaymentCash = "Invisible" + Var FromBrewingProcess = "Invisible" + + Var TimeOutHandPoint = 0 + Var ShowHandPoint = "Invisible" + Var MotionHandPoint = 0 + + Var Show_btn_process = "Enable" + Var Showhelper = "Invisible" + + Var VideoSmoothieProcess = "ROOT/taobin_project/animation01/Taobin_empty.mp4" + + DEBUGVAR TimeOutSmoothiesProcess + + If TimeOutSmoothiesProcess < 100 Then + Var Second_x = 580 + Var CountDown_x = 475 + EndIf + If TimeOutSmoothiesProcess > 99 Then + Var Second_x = 600 + Var CountDown_x = 460 + EndIf Var TextDoorButtonID = 001202 @@ -65,13 +92,80 @@ ;SAVELOG SoundPlaying + Var TimeOutHandPoint = TimeOutHandPoint + 1 + + If TextDoorButtonID = 001202 Then + If Show_btn_process = "Disable" Then + Var ShowHandPoint = "Invisible" + Else + If TimeOutHandPoint > 9 Then + If MotionHandPoint = 0 Then + Var ShowHandPoint = "Enable" + Var MotionHandPoint = 1 + Else + Var ShowHandPoint = "Invisible" + Var MotionHandPoint = 0 + EndIf + EndIf + EndIf + Else + Var ShowHandPoint = "Invisible" + EndIf + If BoxID = 210699 Then + If TextDoorButtonID = 001206 Then + If Show_btn_process = "Disable" Then + Var ShowHandPoint = "Invisible" + Else + If TimeOutHandPoint > 9 Then + If MotionHandPoint = 0 Then + Var ShowHandPoint = "Enable" + Var MotionHandPoint = 1 + Else + Var ShowHandPoint = "Invisible" + Var MotionHandPoint = 0 + EndIf + EndIf + EndIf + Else + Var ShowHandPoint = "Invisible" + EndIf + ;Var Show_btn_process = "Disable" + EndIf + + If Show_btn_process = "Disable" Then + Var VideoSmoothieProcess = "ROOT/taobin_project/animation01/Taobin_pause_art41.mp4" + Var Showhelper = "Enable" + Var Show_btn_help = "Invisible" + Else + If EnableHelperShow = 1 Then + Var Show_btn_help = "Enable" + Else + Var Show_btn_help = "Invisible" + EndIf + Var VideoSmoothieProcess = "ROOT/taobin_project/animation01/TaoBin2_draft02_art41.mp4" + Var Showhelper = "Invisible" + EndIf + + If TimeOutSmoothiesProcess < 100 Then + Var Second_x = 580 + Var CountDown_x = 475 + EndIf + If TimeOutSmoothiesProcess > 99 Then + Var Second_x = 600 + Var CountDown_x = 460 + EndIf + DEBUGVAR TimeOutSmoothiesProcess If TimeOutSmoothiesProcess > 0 Then - Var TimeOutSmoothiesProcess = TimeOutSmoothiesProcess - 1 + If Show_btn_process = "Disable" Then + ; do not thing + Else + Var TimeOutSmoothiesProcess = TimeOutSmoothiesProcess - 1 + EndIf EndIf If TimeOutSmoothiesProcess = 0 Then - Open "ROOT/taobin_project/xml/page_back_to_main.xml" + Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process_3.xml" EndIf @@ -183,8 +277,11 @@ DEBUGVAR LanguageShow + 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" @@ -201,7 +298,9 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Open "ROOT/taobin_project/xml/page_back_to_main.xml" + ;Open "ROOT/taobin_project/xml/page_back_to_main.xml" + DEBUGVAR OpenFileXML + Open OpenFromXML @@ -217,33 +316,77 @@ +; helper +; +; 420 +; 652 +; Showhelper +; 240 +; 341 +; "ROOT/taobin_project/image/page_help_center/helper.png" +; +; Showhelper +; + ; 0 + ; 1080 + ; Showhelper + ; + ; 002409 + ; +; - - 0 - 1337 - 1080 - 85 - Center - - 1201 - - +; helper button + + +; helper button lead + 0 - 1767 + 1724 1080 85 Center - 001210 + 002402 diff --git a/inter/tha/xml/page_smoothie_suggest_and_process_2.xml b/inter/tha/xml/page_smoothie_suggest_and_process_2.xml new file mode 100644 index 00000000..0207e720 --- /dev/null +++ b/inter/tha/xml/page_smoothie_suggest_and_process_2.xml @@ -0,0 +1,484 @@ + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + + SAVELOG "======================================= page_smoothie_suggest_and_process_2.xml ================================" + ; On open + + TopView "show" + ; On open + + Machine WakeUp + + RootLayoutVisible 3 "show" + + ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" + + DEBUGVAR ToppingNewShow + + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/sometime/campaign_sound.ev" + + 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 = "-" + + + If Seeker = "curr" Then + Machine DoorLidClose + EndIf + + CoinVending OFF + + + ; Clear value + Topping "clear" "-" + + + Var DirImage = "ROOT/taobin_project/image/smoothie/proccess" + + + Var ProcessCupDebugText = "" + + DEBUGVAR TimeOutSmoothiesProcess + + If TimeOutSmoothiesProcess < 101 Then + If TimeOutSmoothiesProcess < 11 Then + Var CountDown_x_1 = 515 + Var Second_x_1 = 560 + Else + Var CountDown_x_1 = 485 + Var Second_x_1 = 560 + EndIf + EndIf + If TimeOutSmoothiesProcess > 98 Then + Var CountDown_x_1 = 485 + Var Second_x_1 = 585 + EndIf + + Var TextDoorButtonID = 001202 + + Var SmoothieProcessState = "idle" + Var CountDownCertainConfuse = 5 + + + 1000 + + + ;SAVELOG SoundPlaying + + ; time moving + If TimeOutSmoothiesProcess < 101 Then + If TimeOutSmoothiesProcess < 11 Then + Var CountDown_x_1 = 515 + Var Second_x_1 = 560 + Else + Var CountDown_x_1 = 485 + Var Second_x_1 = 560 + EndIf + EndIf + If TimeOutSmoothiesProcess > 98 Then + Var CountDown_x_1 = 485 + Var Second_x_1 = 585 + EndIf + + DEBUGVAR TimeOutSmoothiesProcess + If TimeOutSmoothiesProcess > 0 Then + Var TimeOutSmoothiesProcess = TimeOutSmoothiesProcess - 1 + EndIf + + If TimeOutSmoothiesProcess = 0 Then + Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process_3.xml" + EndIf + + + DEBUGVAR CH9991_Status + DEBUGVAR CH9992_Status + DEBUGVAR CH9993_Status + DEBUGVAR CH9994_Status + + DEBUGVAR HaveCup + DEBUGVAR CupOnArm + DEBUGVAR DoorCupPosition + DEBUGVAR CupChecking + DEBUGVAR CupArmMove + DEBUGVAR buttonRemoveCup + DEBUGVAR SmoothieProcessState + DEBUGVAR AnyArmConfuse + DEBUGVAR SensorDoorCupStatus + + + If CH9992_Status = "READY" Then + + If DoorCupPosition = "bottom" Then + If SmoothieProcessState = "idle" Then + Var TextDoorButtonID = 001202 + Else + If SmoothieProcessState = "insert" Then + Var TextDoorButtonID = 001203 + + Else + + EndIf + EndIf + Else + If DoorCupPosition = "top" Then + Var TextDoorButtonID = 001204 + If SmoothieProcessState = "press" Then + Var SmoothieProcessState = "insert" + EndIf + Else + If SmoothieProcessState = "idle" Then + + Else + If SmoothieProcessState = "press" Then + + Else + Var TextDoorButtonID = 001205 + EndIf + + EndIf + EndIf + EndIf + + + If AnyArmConfuse = 1 Then + If CountDownCertainConfuse > 0 Then + Var CountDownCertainConfuse = CountDownCertainConfuse - 1 + + If CountDownCertainConfuse = 0 Then + Machine DoorClose + EndIf + EndIf + EndIf + Else + + If CH9992_Status = "RUNNING" Then + Var SmoothieProcessState = "blendnow" + EndIf + EndIf + + If SmoothieProcessState = "blendnow" Then + Var TextDoorButtonID = 001206 + + Var SelectDrink = "12-01-07-0001" + Var SelectSugarID = "" + + Topping "Select" SelectDrink + + Var SmoothieProcessState = "blending" + + EndIf + + If SmoothieProcessState = "blending" Then + + + Menu "set-name" "Smoothie " + Menu "set-image" Seeker.PictureDrink + + + ;Open "ROOT/taobin_project/inter/tha/xml/page_payment_pack_and_send.xml" + + EndIf + + + DEBUGVAR TextDoorButtonID + + Refresh + TimerReset + + +;DEBUGVAR Var [CH9992_Status] = RUNNING + + + DEBUGVAR LanguageShow + + If LanguageShow = "THAI" Then + + EndIf + + If LanguageShow = "ENG" Then + + EndIf + + If LanguageShow = "MYANMAR" Then + + EndIf + + If LanguageShow = "MSC" Then + + EndIf + + + + Var LanguageButtonEnable = "Enable" + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + RefreshAll + + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + +; back + + +; +; +; +; zone +; +; +; + + + + + + + + 300 + 420 + 500 + 72 + + 002400 + + + + + 0 + 550 + + 002405 + + + + + 0 + 1280 + + 002407 + + + +; cancel + + + + 0 + 1530 + 1080 + 85 + Center + + 002402 + + + +; go back + + + + 0 + 1682 + 1080 + 85 + Center + + 002403 + + + + +; second time + + "Enable" + CountDown_x_1 + 1743 + 150 + 72 + 44 + RobotoBold + 0xFFFFFF + TimeOutSmoothiesProcess + + + + "Enable" + Second_x_1 + 1760 + 23 + 30 + "ROOT/taobin_project/image/smoothie/proccess/second.png" + + + + + + + + + + + 5 + 1880 + 24 + Center + 1080 + RobotoRegular + 0xFFFFFF + ProcessCupDebugText + + + + + + + 1 + 1 + KanitTTF + 22 + 1080 + end + 0xFF0000 + "V01 " + + + + + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + + + + Var StrawGetMoreState = "Invisible" + Var bg_lidProblem_ST = "Enable" + Var GetLidButtonState2 = "Invisible" + Var bg_lidProblem_ST2 ="Enable" + + Var XStraw = 376 + Var EnableGetMoreStrawFileName2 = "Invisible" + Var bg_strawProblem_ST2 ="Enable" + + + + Var MachineState_Result = 0 + Var waitAckPay = 1 + Var BREW_COUNT_DOWN_FROM_APP = "on" + Var CountDownBrewing = 122 + Var MachineStage = "testing" + Var BREW_CNT = 122 + + Var InternationalEnable = 1 + DEBUGVAR InternationalEnable + Var LanguageObjectShow = "Enable" + Var NoLangObjectShow = "Invisible" + + + Var Top2Timeout = 19 + DEBUGVAR CountDownBrewing + ;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_lid_straw.xml" + +; Initial for jump to page_brewing3.xml + + + Open "ROOT/taobin_project/inter/tha/xml/page_collect_point_1.lxml" + + Open "ROOT/taobin_project/xml/page_check_member2.xml" + + + + + + Open "ROOT/taobin_project/xml/page_check_member2_campaign.xml" + + + + + Open "ROOT/taobin_project/xml/page_before_check_member.xml" + + + + + + Open "ROOT/taobin_project/xml/page_topup_credit3-TopupSuccess.xml" + + + + + + Open "ROOT/taobin_project/xml/page_payment_credit3-TopupSuccess.xml" + + + diff --git a/inter/tha/xml/page_smoothie_suggest_and_process_3.xml b/inter/tha/xml/page_smoothie_suggest_and_process_3.xml new file mode 100644 index 00000000..46ccb999 --- /dev/null +++ b/inter/tha/xml/page_smoothie_suggest_and_process_3.xml @@ -0,0 +1,386 @@ + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + + SAVELOG "======================================= page_smoothie_suggest_and_process_3.xml ================================" + ; On open + + TopView "show" + ; On open + + Machine WakeUp + + RootLayoutVisible 3 "show" + + ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" + + DEBUGVAR ToppingNewShow + + 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 = "-" + + + If Seeker = "curr" Then + Machine DoorLidClose + EndIf + + CoinVending OFF + + + ; Clear value + Topping "clear" "-" + + + Var DirImage = "ROOT/taobin_project/image/smoothie/proccess" + + + Var ProcessCupDebugText = "" + + Var TimeOutSmoothiesProcess = 0 + + DEBUGVAR TimeOutSmoothiesProcess + + + Var SmoothieProcessState = "idle" + Var CountDownCertainConfuse = 5 + + + 1000 + + + ;SAVELOG SoundPlaying + + DEBUGVAR CH9991_Status + DEBUGVAR CH9992_Status + DEBUGVAR CH9993_Status + DEBUGVAR CH9994_Status + + DEBUGVAR HaveCup + DEBUGVAR CupOnArm + DEBUGVAR DoorCupPosition + DEBUGVAR CupChecking + DEBUGVAR CupArmMove + DEBUGVAR buttonRemoveCup + DEBUGVAR SmoothieProcessState + DEBUGVAR AnyArmConfuse + DEBUGVAR SensorDoorCupStatus + + + If CH9992_Status = "READY" Then + + If DoorCupPosition = "bottom" Then + If SmoothieProcessState = "idle" Then + Var TextDoorButtonID = 001202 + Else + If SmoothieProcessState = "insert" Then + Var TextDoorButtonID = 001203 + + Else + + EndIf + EndIf + Else + If DoorCupPosition = "top" Then + Var TextDoorButtonID = 001204 + If SmoothieProcessState = "press" Then + Var SmoothieProcessState = "insert" + EndIf + Else + If SmoothieProcessState = "idle" Then + + Else + If SmoothieProcessState = "press" Then + + Else + Var TextDoorButtonID = 001205 + EndIf + + EndIf + EndIf + EndIf + + + If AnyArmConfuse = 1 Then + If CountDownCertainConfuse > 0 Then + Var CountDownCertainConfuse = CountDownCertainConfuse - 1 + + If CountDownCertainConfuse = 0 Then + Machine DoorClose + EndIf + EndIf + EndIf + Else + + If CH9992_Status = "RUNNING" Then + Var SmoothieProcessState = "blendnow" + EndIf + EndIf + + If SmoothieProcessState = "blendnow" Then + Var TextDoorButtonID = 001206 + + Var SelectDrink = "12-01-07-0001" + Var SelectSugarID = "" + + Topping "Select" SelectDrink + + Var SmoothieProcessState = "blending" + + EndIf + + If SmoothieProcessState = "blending" Then + + + Menu "set-name" "Smoothie " + Menu "set-image" Seeker.PictureDrink + + + ;Open "ROOT/taobin_project/inter/tha/xml/page_payment_pack_and_send.xml" + + EndIf + + + Refresh + TimerReset + + +;DEBUGVAR Var [CH9992_Status] = RUNNING + + + DEBUGVAR LanguageShow + + If LanguageShow = "THAI" Then + Var warning_time_x = 220 + Var warning_time_y = 570 + EndIf + + If LanguageShow = "ENG" Then + Var warning_time_x = 240 + Var warning_time_y = 570 + EndIf + + If LanguageShow = "MYANMAR" Then + Var warning_time_x = 110 + Var warning_time_y = 555 + EndIf + + If LanguageShow = "MSC" Then + Var warning_time_x = 350 + Var warning_time_y = 570 + EndIf + + + + Var LanguageButtonEnable = "Enable" + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + RefreshAll + + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + +; back + + +; +; +; +; zone +; +; +; + + + + + +; warning time + + "Enable" + warning_time_x + warning_time_y + "ROOT/taobin_project/image/smoothie/proccess/clock.png" + + + + 50 + 550 + + 002408 + + + + + 0 + 1280 + + 002406 + + + +; cancel to home + + + + 0 + 1760 + 1080 + 85 + Center + + 002404 + + + + + 5 + 1880 + 24 + Center + 1080 + RobotoRegular + 0xFFFFFF + ProcessCupDebugText + + + + + + + 1 + 1 + KanitTTF + 22 + 1080 + end + 0xFF0000 + "V01 " + + + + + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + + + + Var StrawGetMoreState = "Invisible" + Var bg_lidProblem_ST = "Enable" + Var GetLidButtonState2 = "Invisible" + Var bg_lidProblem_ST2 ="Enable" + + Var XStraw = 376 + Var EnableGetMoreStrawFileName2 = "Invisible" + Var bg_strawProblem_ST2 ="Enable" + + + + Var MachineState_Result = 0 + Var waitAckPay = 1 + Var BREW_COUNT_DOWN_FROM_APP = "on" + Var CountDownBrewing = 122 + Var MachineStage = "testing" + Var BREW_CNT = 122 + + Var InternationalEnable = 1 + DEBUGVAR InternationalEnable + Var LanguageObjectShow = "Enable" + Var NoLangObjectShow = "Invisible" + + + Var Top2Timeout = 19 + DEBUGVAR CountDownBrewing + ;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_lid_straw.xml" + +; Initial for jump to page_brewing3.xml + + + ;Open "ROOT/taobin_project/inter/tha/xml/page_collect_point_1.lxml" + + Open "ROOT/taobin_project/xml/page_check_member2.xml" + + + + + + Open "ROOT/taobin_project/xml/page_check_member2_campaign.xml" + + + + + Open "ROOT/taobin_project/xml/page_before_check_member.xml" + + + + + + Open "ROOT/taobin_project/xml/page_topup_credit3-TopupSuccess.xml" + + + + + + Open "ROOT/taobin_project/xml/page_payment_credit3-TopupSuccess.xml" + + + diff --git a/inter/tha/xml/page_topping_frozen_fruit_select.lxml b/inter/tha/xml/page_topping_frozen_fruit_select.lxml index cff90c0e..3dbb8089 100644 --- a/inter/tha/xml/page_topping_frozen_fruit_select.lxml +++ b/inter/tha/xml/page_topping_frozen_fruit_select.lxml @@ -177,6 +177,69 @@ TimerReset + + DEBUGVAR LanguageShow + DEBUGVAR InternationalEnable + + SAVELOG "EventLanguageOnChange menu -list" + + If InternationalEnable = 1 Then + If CountryName = "Thailand" Then + Var show_eng_button_stage = "Invisible" + Var LanguageButtonEnable = "Enable" + EndIf + If CountryName = "HongKong" Then + Var show_eng_button_stage = "Invisible" + Var LanguageButtonEnable = "Invisible" + Var BtnLangToggleIndex = "Enable" + EndIf + Else + Var LanguageButtonEnable = "Invisible" + Var show_eng_button_stage = "Enable" + EndIf + + If LanguageShow = "ENG" Then + Var showname_max_size = 58 + Var warning_image_x = 220 + Var warning_image_y = 1333 + Var warning_text_x = 20 + Var warning_text_y = 1312 + Var text_payment_next_x = 132 + EndIf + + If LanguageShow = "THAI" Then + Var showname_max_size = 68 + Var warning_image_x = 335 + Var warning_image_y = 1333 + Var warning_text_x = 20 + Var warning_text_y = 1312 + Var text_payment_next_x = 142 + EndIf + + If LanguageShow = "MSC" Then + Var showname_max_size = 68 + Var warning_image_x = 350 + Var warning_image_y = 1333 + Var warning_text_x = 20 + Var warning_text_y = 1312 + Var text_payment_next_x = 142 + EndIf + + If LanguageShow = "MYANMAR" Then + Var showname_max_size = 68 + Var warning_image_x = 300 + Var warning_image_y = 1333 + Var warning_text_x = 10 + Var warning_text_y = 1312 + Var text_payment_next_x = 142 + EndIf + + ;OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_frozen_fruit_select.lxml" + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + RefreshAll + + + 0 380 @@ -266,7 +329,7 @@ ; same 374 - 382 + 752 331 436 PictureDrink @@ -291,27 +354,58 @@ ; Text head 0 - 752 + 602 1080 Center - 68 + showname_max_size + Auto + 2 KanitMediumTTF 0x513C2F showname -; same + 0 - 836 + 1082 1080 Center - 24 - KanitLightTTF + 68 + KanitMediumTTF + 0xEE8C62 + text_price_d3 + + +; same + + 25 + 1232 + 1080 + Center + 32 + KanitMediumTTF 0x6F5F51 showdesc +; warning time + + "Enable" + warning_image_x + warning_image_y + "ROOT/taobin_project/image/topping_inter/time.png" + + + "Enable" + warning_text_x + warning_text_y + + 0 + 19 + 002290 + + @@ -324,33 +418,6 @@ -; back - @@ -437,10 +504,10 @@ ; next + + 420 + 1442 + 250 + 75 + + 002291 + + + @@ -990,5 +1065,8 @@ ; + + OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml" + diff --git a/inter/tha/xml/ticket_time_blending.ev b/inter/tha/xml/ticket_time_blending.ev new file mode 100644 index 00000000..0fa5b894 --- /dev/null +++ b/inter/tha/xml/ticket_time_blending.ev @@ -0,0 +1,5 @@ +If TimeOutSmoothiesProcess > -1 Then + Var TimeOutSmoothiesProcess = TimeOutSmoothiesProcess +Else + Var TimeOutSmoothiesProcess = 120 +EndIf \ No newline at end of file diff --git a/inter/tha/xml/topview_helper.lxml b/inter/tha/xml/topview_helper.lxml new file mode 100644 index 00000000..8093d219 --- /dev/null +++ b/inter/tha/xml/topview_helper.lxml @@ -0,0 +1,52 @@ + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + + SAVELOG "======================================= Helper Icon ================================" + + + + + + ;include="ROOT/taobin_project/inter/tha/xml/helper_show_and_refresh.lxml" + + Var Timeout = 0 + + SetInstanceIgnoreTouch + + DEBUGVAR SlientRefreshIndex + + + 1000 + + + + Refresh + TimerReset + + +; helper button + + + + diff --git a/xml/page_NewBrewing3.xml b/xml/page_NewBrewing3.xml index e7a6af70..aa53ad3c 100644 --- a/xml/page_NewBrewing3.xml +++ b/xml/page_NewBrewing3.xml @@ -6,6 +6,8 @@ SoundVolume + RootLayoutVisible 3 "hide" + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payext_setup.ev" Var SendNotiPaySuccess = 2 diff --git a/xml/page_board.xml b/xml/page_board.xml index 16bd1d12..8ceafa97 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -134,6 +134,8 @@ Var ShowButtonClick_WTC = "Invisible" Var ShowButtonClickFull_WTC = "Invisible" + Var BtnLangToggleIndex = "Invisible" + ;SAVELOG DisplayType If DisplayType = "2" Then @@ -1314,7 +1316,35 @@ If EnableMultiInstanceFromBoxID = 1 Then If CountryName = "Thailand" Then - + + ; enable btn_change_langs + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 608 + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 590 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + RootLayoutVisible 3 "show" + + ; enable helper + Var EnableHelperShow = 1 + ;Var FromDrinkOk = 1 + Var CurrHelpCenter = 0 + If EnableHelperShow = 1 Then + If FromDrinkOk = 1 Then + Var TimeOutShowHelpCenter = 15 + + Var FromSmoothieProcess = "Invisible" + Var FromPaymentCash = "Invisible" + Var FromBrewingProcess = "Enable" + + RootLayoutVisible 15 "show" + OpenInst 15 "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml" + Else + RootLayoutVisible 15 "hide" + EndIf + EndIf + Var EnableMultiInstance = "true" Var MyanmarLangEnable = "true" Var InternationalShow = 0 @@ -1328,6 +1358,12 @@ Var InternationalShow = 0 EndIf + If BoxID = 210699 Then + Var SpiralOnline = "true" + Var SpiralModeFrozenFruit = 1 + Var InternationalShow = 1 + EndIf + ; test payment Var New_Payment = 1 @@ -1457,7 +1493,13 @@ ;DEBUGVAR LivenessControlVersion ;DEBUGVAR Not#CameraSettingStatus - RootLayoutVisible 3 "hide" + If EnableMultiInstanceFromBoxID = 1 Then + If CountryName = "Thailand" Then + RootLayoutVisible 3 "show" + Else + RootLayoutVisible 3 "hide" + EndIf + EndIf If SELLSTATUS = "DEACTIVE" Then OpenInst 0 "/ROOT/xml/offline.xml" @@ -2235,11 +2277,41 @@ PRICE "Reset" "-" Open "ROOT/taobin_project/xml/page_sleepmode.xml" EndIf + ; for count helper show + If EnableHelperShow = 1 Then + If FromDrinkOk = 1 Then + If TimeOutShowHelpCenter > 0 Then + Var TimeOutShowHelpCenter = TimeOutShowHelpCenter - 1 + EndIf + + If TimeOutShowHelpCenter = 0 Then + Var FromDrinkOk = 0 + If CurrHelpCenter = 1 Then + ;do not thing + Else + OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" + EndIf + EndIf + EndIf + EndIf + Refresh TimerReset + + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 608 + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 590 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + RefreshAll + + SAVELOG "EVENT END" diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index b6b69e21..23ffbe6d 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -5,7 +5,7 @@ "0xeae6e1" SoundVolume - + RootLayoutVisible 3 "hide" If New_Payment = 1 Then Open "ROOT/taobin_project/xml/page_NewBrewing3.xml" diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml index 6d3bdd25..7d19fa1a 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -5,7 +5,8 @@ "0xeae6e1" SoundVolume - + RootLayoutVisible 3 "hide" + Var waitAckPay = 0 Var ChangeFlag = 0 diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index d4a427c1..6099d71a 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -293,6 +293,9 @@ Var EnableDoorJamAlert = 0 + ; helper show in page_board + Var FromDrinkOk = 1 + 500 diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 7785f86a..48038fed 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -430,7 +430,11 @@ If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID EndIf - MakeDrinkV1 SelectDrink SelectSugarID + If SmoothieToPayment = 1 Then + ; do nothing + Else + MakeDrinkV1 SelectDrink SelectSugarID + EndIf Var TxRef1 = "" CreateTxRef1 TxRef1 Else @@ -441,7 +445,11 @@ Var PaidPaymentFromNextStage = 1 EndIf - Open "ROOT/taobin_project/xml/page_thankyou.xml" + If SmoothieToPayment = 1 Then + Open "ROOT/taobin_project/xml/page_spiral_sell.xml" + Else + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf EndIf @@ -457,7 +465,11 @@ If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID EndIf - MakeDrinkV1 SelectDrink SelectSugarID + If SmoothieToPayment = 1 Then + ; do nothing + Else + MakeDrinkV1 SelectDrink SelectSugarID + EndIf Var TxRef1 = "" CreateTxRef1 TxRef1 Else @@ -468,7 +480,11 @@ Var PaidPaymentFromNextStage = 1 EndIf - Open "ROOT/taobin_project/xml/page_thankyou.xml" + If SmoothieToPayment = 1 Then + Open "ROOT/taobin_project/xml/page_spiral_sell.xml" + Else + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf EndIf @@ -1290,6 +1306,17 @@ Var X_CASH3 = 664 - 113 EndIf + Var FromSmoothieProcess = "Invisible" + Var FromPaymentCash = "Enable" + Var FromBrewingProcess = "Invisible" + + If EnableHelperShow = 1 Then + Var Showhelper = "Enable" + Else + Var Showhelper = "Invisible" + EndIf + + @@ -1370,7 +1397,11 @@ If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID EndIf - MakeDrinkV1 SelectDrink SelectSugarID + If SmoothieToPayment = 1 Then + ; do nothing + Else + MakeDrinkV1 SelectDrink SelectSugarID + EndIf ;Var TxRef1 = "" ;CreateTxRef1 TxRef1 EndIf @@ -1378,7 +1409,11 @@ Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" Var BrewingTextThai = "เตรียมแก้ว" - Open "ROOT/taobin_project/xml/page_thankyou.xml" + If SmoothieToPayment = 1 Then + Open "ROOT/taobin_project/xml/page_spiral_sell.xml" + Else + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf EndIf @@ -1924,12 +1959,20 @@ If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID EndIf - MakeDrinkV1 SelectDrink SelectSugarID + If SmoothieToPayment = 1 Then + ; do nothing + Else + MakeDrinkV1 SelectDrink SelectSugarID + EndIf EndIf Var Seeker.CreditCard = 1 Var Seeker.CreditCardRef = CreditCardRef - Open "ROOT/taobin_project/xml/page_thankyou.xml" + If SmoothieToPayment = 1 Then + Open "ROOT/taobin_project/xml/page_spiral_sell.xml" + Else + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf EndIf EndIf @@ -2170,8 +2213,12 @@ If TestLoopMakeDrink = 1 Then - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" + If SmoothieToPayment = 1 Then + Open "ROOT/taobin_project/xml/page_spiral_sell.xml" + Else + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf EndIf @@ -2202,7 +2249,11 @@ If New_Payment = 1 Then __CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID EndIf - MakeDrinkV1 SelectDrink SelectSugarID + If SmoothieToPayment = 1 Then + ; do nothing + Else + MakeDrinkV1 SelectDrink SelectSugarID + EndIf Var TxRef1 = "" CreateTxRef1 TxRef1 Else @@ -2213,7 +2264,11 @@ EndIf - Open "ROOT/taobin_project/xml/page_thankyou.xml" + If SmoothieToPayment = 1 Then + Open "ROOT/taobin_project/xml/page_spiral_sell.xml" + Else + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf Else If CancelFlag = 0 Then @@ -2754,7 +2809,25 @@ EndIf +; helper button + @@ -2885,8 +2958,12 @@ Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" Var MachineStage = "make-drink" Var BrewingTextThai = "เตรียมแก้ว" - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" + If SmoothieToPayment = 1 Then + Open "ROOT/taobin_project/xml/page_spiral_sell.xml" + Else + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf ;Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate EndIf @@ -3737,11 +3814,19 @@ eval( If IgnoreNetCore = "true" Then If Seeker = "curr" Then - MakeDrinkV1 SelectDrink SelectSugarID + If SmoothieToPayment = 1 Then + ; do nothing + Else + MakeDrinkV1 SelectDrink SelectSugarID + EndIf Else EndIf - Open "ROOT/taobin_project/xml/page_thankyou.xml" + If SmoothieToPayment = 1 Then + Open "ROOT/taobin_project/xml/page_spiral_sell.xml" + Else + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf EndIf @@ -3758,9 +3843,12 @@ eval( - - MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/page_thankyou.xml" + If SmoothieToPayment = 1 Then + Open "ROOT/taobin_project/xml/page_spiral_sell.xml" + Else + MakeDrinkV1 SelectDrink SelectSugarID + Open "ROOT/taobin_project/xml/page_thankyou.xml" + EndIf diff --git a/xml/page_spiral_failed.xml b/xml/page_spiral_failed.xml new file mode 100644 index 00000000..c5be9cc3 --- /dev/null +++ b/xml/page_spiral_failed.xml @@ -0,0 +1,56 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" +; "ROOT/taobin_project/sounds/chaching.mp3" + SoundVolume + + + Var Timeout = 0 + Var ShowSwapVDO = "ROOT/taobin_project/spiral/video/sp01.mp4" + + + 1000 + + + Var Timeout = Timeout + 1 + + If Timeout > 3 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + TimerReset + Refresh + + + + + + + + + 89 + 700 + 902 + 902 + "ROOT/taobin_project/spiral/image/page_spiral/spiral_fail.png" + + + + 84 + 1314 + 911 + 265 + "ROOT/taobin_project/spiral/image/page_spiral/spiral_text_fail.png" + + +;include="ROOT/taobin_project/inc/video.inc" + + + + + + + + \ No newline at end of file diff --git a/xml/page_spiral_sell.xml b/xml/page_spiral_sell.xml new file mode 100644 index 00000000..242e9050 --- /dev/null +++ b/xml/page_spiral_sell.xml @@ -0,0 +1,133 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" +; "ROOT/taobin_project/sounds/chaching.mp3" + SoundVolume + + + Var Timeout = 0 + Var LastMakeSpiralResult = 0 + Var ShowSwapVDO = "ROOT/taobin_project/spiral/video/sp01.mp4" + GenHashWithTimeStamp SpiralRef + Var ServiceCredit = "03-02-00-6001" + SPIRAL_SELL ServiceCredit SpiralRef + + Var SmoothieToPayment = 0 + Var TimeOutSmoothiesProcess = 120 + + + 1000 + + + Var Timeout = Timeout + 1 + + If LastMakeSpiralResult = 1 Then + + Var SessionID4 = MachineSpiralID + Var SessionID4 = SessionID4 + ":" + Var SessionID4 = SessionID4 + MachineSpiralVMName + Var SessionID4 = SessionID4 + ":" + Var SessionID4 = SessionID4 + MachineSpiralSlotID + Var SessionID4 = SessionID4 + ":" + Var SessionID4 = SessionID4 + ServiceCredit + Var SessionID4 = SessionID4 + ":" + Var SessionID4 = SessionID4 + 1 + Var SessionID4 = SessionID4 + ":" + Var SessionID4 = SessionID4 + MachineSpiralRemaining + + Var PayDetail="S:0:" + Var PayDetail = PayDetail + SessionID4 + + Var Cid = 27 + Var PointCrm = CounterOrderId + If FromCounterMulti = 1 Then + Var PointCrm = PayReference + EndIf + Var GetScore = Seeker.VendingTSID + Var param1 = PayDetail + Var ACC = "0899999999" + + AddData Cid ACC param1 PointCrm GetScore + ;Open "ROOT/taobin_project/xml/page_spiral_success.xml" + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml" + EndIf + + If LastMakeSpiralResult = 2 Then + + Var SessionID4 = MachineSpiralID + Var SessionID4 = SessionID4 + ":" + Var SessionID4 = SessionID4 + MachineSpiralVMName + Var SessionID4 = SessionID4 + ":" + Var SessionID4 = SessionID4 + MachineSpiralSlotID + Var SessionID4 = SessionID4 + ":" + Var SessionID4 = SessionID4 + ServiceCredit + Var SessionID4 = SessionID4 + ":" + Var SessionID4 = SessionID4 + 1 + Var SessionID4 = SessionID4 + ":" + Var SessionID4 = SessionID4 + MachineSpiralRemaining + + Var PayDetail="F:" + Var PayDetail = PayDetail + MachineSpiralErrorCode + Var PayDetail = PayDetail + ":" + Var PayDetail = PayDetail + SessionID4 + + Var Cid = 27 + Var PointCrm = CounterOrderId + If FromCounterMulti = 1 Then + Var PointCrm = PayReference + EndIf + Var GetScore = Seeker.VendingTSID + Var param1 = PayDetail + Var ACC = "0899999999" + + AddData Cid ACC param1 PointCrm GetScore + Open "ROOT/taobin_project/xml/page_spiral_failed.xml" + + EndIf + + If BoxID = 210699 Then + ;If Timeout > 10 Then + ;Open "ROOT/taobin_project/xml/page_spiral_failed.xml" + ;EndIf + 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" + EndIf + EndIf + + If Timeout > 120 Then + Open "ROOT/taobin_project/xml/page_back_to_failed.xml" + EndIf + + TimerReset + Refresh + + + + + + + + + +;include="ROOT/taobin_project/inc/video.inc" + + + + + + + + \ No newline at end of file diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 7869f973..4ba25dc0 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -7,6 +7,9 @@ SoundVolume ; On open + + RootLayoutVisible 3 "hide" + Var CountDownThankyou = 3 Var CountDownBrewing = BrewTime Var CountUpBrewing = 0 diff --git a/xml/topview2.xml b/xml/topview2.xml index 9c1bfcbe..ded6b8f3 100644 --- a/xml/topview2.xml +++ b/xml/topview2.xml @@ -19,6 +19,7 @@ EndIf If CountryName = "Thailand" Then + Var BtnLangToggleIndex = "Invisible" TRY topview2_script EndIf