diff --git a/xml/menu_CollectPoint_Page1.xml b/xml/menu_CollectPoint_Page1.xml deleted file mode 100644 index a0ff6b17..00000000 --- a/xml/menu_CollectPoint_Page1.xml +++ /dev/null @@ -1,342 +0,0 @@ - - - 1080 - 1312 - "ROOT/image/BG_Menu_Point_Page1.bmp" - SoundVolume - - - ; On open - TopView "hide" - - Var Timeout = 0 - Var TelephoneNumber = "" - - - 1000 - - - - - - Var Timeout = Timeout + 1 - If Timeout > 20 Then - Open "/media/bt/xml/menu_page5.xml" - EndIf - - TimerReset - Refresh - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 310 - 380 - 474 - Center - 50 - fontType1 - 0xF0E000 - TelephoneNumber - Telnum - - - - - - - Open "/media/bt/xml/security_alarm.xml" - - - If MachineStage = "drink-success" Then - Var MachineState_Result = 1 - EndIf - - If MachineStage = "drink-failed" Then - Var MachineState_Result = 1 - EndIf - - - - - - diff --git a/xml/menu_CollectPoint_Page2.xml b/xml/menu_CollectPoint_Page2.xml deleted file mode 100644 index ca85a857..00000000 --- a/xml/menu_CollectPoint_Page2.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - 1080 - 1312 - "ROOT/image/BG_Menu_Point_Page1.bmp" - SoundVolume - - - ; On open - - Var Timeout = 0 - - - - - - 1000 - - ;Open "ROOT/xml/menu_board.xml" - - Var Timeout = Timeout + 1 - If Timeout > 30 Then - ;Var CoffeePoint = 1 - ;Open "/media/bt/xml/menu_CollectPoint_Page3.xml" - If StepGetPoint = 0 Then - Open "/media/bt/xml/menu_pageConsent.xml" - Else - Var CoffeePoint = 1 - Open "/media/bt/xml/menu_CollectPoint_Page3.xml" - EndIf - - EndIf - - TimerReset - Refresh - - - - - 310 - 380 - 474 - Center - 50 - fontType1 - 0xF0E000 - TelephoneNumber - Telnum - - - - 310 - 550 - 474 - Center - 50 - fontType1 - 0xF0E000 - "กรุณารอซักครู่..." - - - - - - - Open "/media/bt/xml/security_alarm.xml" - - - - - If StepGetPoint = 0 Then - If PdpaAsk = 0 Then - Open "/media/bt/xml/menu_pageConsent.xml" - Else - Var StepGetPoint = 1 - GETACCEXT TelephoneNumber 5 - Open "/media/bt/xml/menu_CollectPoint_Page2.xml" - EndIf - Else - If Ext1a = "" Then - Var CoffeePoint = 1 - Open "/media/bt/xml/menu_CollectPoint_Page3.xml" - - Else - - Var CoffeePoint1 = Ext21 - INT CoffeePoint1 - - Var CoffeePoint = 1 + CoffeePoint1 - Open "/media/bt/xml/menu_CollectPoint_Page3.xml" - - EndIf - EndIf - - - - - - - If StepGetPoint = 0 Then - Open "/media/bt/xml/menu_pageConsent.xml" - Else - Var CoffeePoint = 1 - Open "/media/bt/xml/menu_CollectPoint_Page3.xml" - EndIf - - - - - If MachineStage = "drink-success" Then - Var MachineState_Result = 1 - EndIf - - If MachineStage = "drink-failed" Then - Var MachineState_Result = 1 - EndIf - - - - diff --git a/xml/menu_CollectPoint_Page3.xml b/xml/menu_CollectPoint_Page3.xml deleted file mode 100644 index 01a7be75..00000000 --- a/xml/menu_CollectPoint_Page3.xml +++ /dev/null @@ -1,265 +0,0 @@ - - - 1080 - 1312 - "ROOT/image/BG_Menu_Point_Page2.bmp" - SoundVolume - - - ; On open - - Var Timeout = 0 - - Var Point1_State = "Disable" - Var Point2_State = "Disable" - Var Point3_State = "Disable" - Var Point4_State = "Disable" - Var Point5_State = "Disable" - Var Point6_State = "Disable" - Var Point7_State = "Disable" - Var Point8_State = "Disable" - Var Point9_State = "Disable" - Var Point10_State = "Disable" - - If CoffeePoint >= 1 Then - Var Point1_State = "Enable" - EndIf - - If CoffeePoint >= 2 Then - Var Point2_State = "Enable" - EndIf - - If CoffeePoint >= 3 Then - Var Point3_State = "Enable" - EndIf - - If CoffeePoint >= 4 Then - Var Point4_State = "Enable" - EndIf - - If CoffeePoint >= 5 Then - Var Point5_State = "Enable" - EndIf - - If CoffeePoint >= 6 Then - Var Point6_State = "Enable" - EndIf - - If CoffeePoint >= 7 Then - Var Point7_State = "Enable" - EndIf - - If CoffeePoint >= 8 Then - Var Point8_State = "Enable" - EndIf - - If CoffeePoint >= 9 Then - Var Point9_State = "Enable" - EndIf - - If CoffeePoint >= 10 Then - Var Point10_State = "Enable" - EndIf - - Var BmiYear = "0/0/0/1/0/0" - Var PointCrm = "pdpa1" - Var GetScore = "" - AddData 4 TelephoneNumber BmiYear PointCrm GetScore - - - Var CoffeePointStr = CoffeePoint - - - - - 1000 - - ;Open "ROOT/xml/menu_board.xml" - - Var Timeout = Timeout + 1 - If Timeout > 20 Then - Open "ROOT/xml/menu_page5.xml" - EndIf - - TimerReset - Refresh - - - - - - - - - - - - - - - - - - - - - - - - - - 310 - 315 - 474 - Center - 50 - fontType1 - 0xF0E000 - TelephoneNumber - Telnum - - - - 500 - 410 - 50 - Center - 35 - fontType1 - 0x000000 - CoffeePointStr - - - - - - - - Open "/media/bt/xml/security_alarm.xml" - - - - If MachineStage = "drink-success" Then - Var MachineState_Result = 1 - EndIf - - If MachineStage = "drink-failed" Then - Var MachineState_Result = 1 - EndIf - - - - diff --git a/xml/menu_board.xml b/xml/menu_board.xml index 7319fc8c..d556acc0 100644 --- a/xml/menu_board.xml +++ b/xml/menu_board.xml @@ -27,13 +27,14 @@ Var countClick = 0 - Var RoadShow = "false" + Var RoadShow = "true" Var IgnorePoint = "true" Var CountDownShowButton = 30 Var ShowButtonClick = "Enable" Var ShowButtonClickFull = "Invisible" + 800 @@ -43,6 +44,7 @@ SAVELOG CountDownShowButton + SAVELOG ShowButtonClickFull If CountDownShowButton = 28 Then Var ShowButtonClickFull = "Enable" @@ -151,8 +153,8 @@ 2 2 ShowButtonClickFull - 1076 - 1308 + 1070 + 1200 "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume diff --git a/xml/menu_head.py b/xml/menu_head.py index 0587c934..1ede6f92 100644 --- a/xml/menu_head.py +++ b/xml/menu_head.py @@ -1,5 +1,5 @@ - RoadShow = False + RoadShow = True default_dir = 'ROOT/taobin_project/image/menu_drink/' default_dir2 = 'ROOT/taobin_project/image/menu_drink_select/' diff --git a/xml/menu_payment_cash.xml b/xml/menu_payment_cash.xml index b64cb750..7acb6f6b 100644 --- a/xml/menu_payment_cash.xml +++ b/xml/menu_payment_cash.xml @@ -60,31 +60,33 @@ SAVELOG QRChannel SAVELOG QRCODE99 - If QRChannel = 0 Then - ;Var VendingQRCode = "ERROR" - VendingQR ON - CoinVending ON - ;Var QRCODE99 = "" - + If RoadShow = "false" Then + If QRChannel = 0 Then + ;Var VendingQRCode = "ERROR" + VendingQR ON + CoinVending ON + ;Var QRCODE99 = "" + - Else - ;Var VendingQRCode = "OK" - VendingQR ON - CoinVending OFF - Var QRCODE99 = QRCODETMP - Var RemainAmountStr = "" - Var CashTextWarning = "" - - - If QRCODE99 = "" Then - Var CashTextWarning = "ระบบ Promtpay ไม่สามารถใช้งานได้ในขณะนี้" - Var QRErrorState = "Enable" Else - Var QRErrorState = "Invisible" - EndIf + ;Var VendingQRCode = "OK" + VendingQR ON + CoinVending OFF + Var QRCODE99 = QRCODETMP + Var RemainAmountStr = "" + Var CashTextWarning = "" - + If QRCODE99 = "" Then + Var CashTextWarning = "ระบบ Promtpay ไม่สามารถใช้งานได้ในขณะนี้" + Var QRErrorState = "Enable" + Else + Var QRErrorState = "Invisible" + EndIf + + + + EndIf EndIf Topping "Select1-ID" topping1 @@ -113,7 +115,14 @@ Var PayWithQR = 0 Var NoGotoMenupage = "false" - + + Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png" + Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png" + If RoadShow = "true" Then + + Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash_2.png" + Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash_2.png" + EndIf @@ -313,11 +322,12 @@ 0 "ROOT/taobin_project/image/ad_medium_2.png" - Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" Var MachineStage = "make-drink" - Var BrewingTextThai = "เตรียมแก้ว" + ;Var BrewingTextThai = "เตรียมแก้ว" ;MakeDrinkV1 SelectDrink SelectSugarID - Open "ROOT/taobin_project/xml/menu_thankyou.xml" + + ;Open "ROOT/taobin_project/xml/menu_thankyou.xml" + @@ -360,8 +370,8 @@ 287 1282 PayState1 - "ROOT/taobin_project/image/page_payment/bn_cash.png" - "ROOT/taobin_project/image/page_payment/bp_cash.png" + FilenameShowbuttonCashBN + FilenameShowbuttonCashBP "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume diff --git a/xml/menu_payment_code.xml b/xml/menu_payment_code.xml index 12856853..280bf3f6 100644 --- a/xml/menu_payment_code.xml +++ b/xml/menu_payment_code.xml @@ -67,11 +67,11 @@ Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "1" - Trim TelephoneNumber 10 + Trim TelephoneNumber 8 TimerReset Refresh StrLen TelephoneNumber TelNumLen - If TelNumLen >= 10 Then + If TelNumLen >= 8 Then Var Tel_Confirm_State = "Enable" EndIf @@ -87,11 +87,11 @@ Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "2" - Trim TelephoneNumber 10 + Trim TelephoneNumber 8 TimerReset Refresh StrLen TelephoneNumber TelNumLen - If TelNumLen >= 10 Then + If TelNumLen >= 8 Then Var Tel_Confirm_State = "Enable" EndIf @@ -107,11 +107,11 @@ Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "3" - Trim TelephoneNumber 10 + Trim TelephoneNumber 8 TimerReset Refresh StrLen TelephoneNumber TelNumLen - If TelNumLen >= 10 Then + If TelNumLen >= 8 Then Var Tel_Confirm_State = "Enable" EndIf @@ -127,11 +127,11 @@ Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "4" - Trim TelephoneNumber 10 + Trim TelephoneNumber 8 TimerReset Refresh StrLen TelephoneNumber TelNumLen - If TelNumLen >= 10 Then + If TelNumLen >= 8 Then Var Tel_Confirm_State = "Enable" EndIf @@ -147,11 +147,11 @@ Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "5" - Trim TelephoneNumber 10 + Trim TelephoneNumber 8 TimerReset Refresh StrLen TelephoneNumber TelNumLen - If TelNumLen >= 10 Then + If TelNumLen >= 8 Then Var Tel_Confirm_State = "Enable" EndIf @@ -167,11 +167,11 @@ Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "6" - Trim TelephoneNumber 10 + Trim TelephoneNumber 8 TimerReset Refresh StrLen TelephoneNumber TelNumLen - If TelNumLen >= 10 Then + If TelNumLen >= 8 Then Var Tel_Confirm_State = "Enable" EndIf @@ -187,11 +187,11 @@ Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "7" - Trim TelephoneNumber 10 + Trim TelephoneNumber 8 TimerReset Refresh StrLen TelephoneNumber TelNumLen - If TelNumLen >= 10 Then + If TelNumLen >= 8 Then Var Tel_Confirm_State = "Enable" EndIf @@ -207,11 +207,11 @@ Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "8" - Trim TelephoneNumber 10 + Trim TelephoneNumber 8 TimerReset Refresh StrLen TelephoneNumber TelNumLen - If TelNumLen >= 10 Then + If TelNumLen >= 8 Then Var Tel_Confirm_State = "Enable" EndIf @@ -227,11 +227,11 @@ Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "9" - Trim TelephoneNumber 10 + Trim TelephoneNumber 8 TimerReset Refresh StrLen TelephoneNumber TelNumLen - If TelNumLen >= 10 Then + If TelNumLen >= 8 Then Var Tel_Confirm_State = "Enable" EndIf @@ -247,9 +247,9 @@ Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "0" - Trim TelephoneNumber 10 + Trim TelephoneNumber 8 StrLen TelephoneNumber TelNumLen - If TelNumLen >= 10 Then + If TelNumLen >= 8 Then Var Tel_Confirm_State = "Enable" EndIf Var ShowTextNumber = "Invisible" @@ -313,6 +313,10 @@ SoundVolume + If RoadShow = "true" Then + + Else + If GetPayInfoFlag = 0 Then VendingQR OFF @@ -360,7 +364,7 @@ Open "/media/bt/xml/menu_page4-CodeWaiting.xml" EndIf - + EndIf Refresh diff --git a/xml/menu_topping_alter.xml b/xml/menu_topping_alter.xml index a7ec3ecc..85a595c5 100644 --- a/xml/menu_topping_alter.xml +++ b/xml/menu_topping_alter.xml @@ -33,7 +33,7 @@ Var y2_topping_bg = y_topping_bg + y_block Var y2_topping = y_topping + y_block - + Var topping1 = "1" Var BugFlag = 0 30000 @@ -83,7 +83,8 @@ SAVELOG TOPPING1 SAVELOG MenuCodeName - + SAVELOG toppingID1Default + If BugFlag = 1 Then Else @@ -99,11 +100,15 @@ Var SugarState5 = "Enable" Var BGSugar = "Enable" Var BugFlag = 1 + Var topping1 = toppingID1Default Refresh Else Open "ROOT/taobin_project/xml/menu_payment.xml" EndIf + If RoadShow = "true" Then + Var PriceShowValue = "Free" + EndIf EndIf diff --git a/xml/menu_topping_with_barista.xml b/xml/menu_topping_with_barista.xml index 1996c3fd..d15964df 100644 --- a/xml/menu_topping_with_barista.xml +++ b/xml/menu_topping_with_barista.xml @@ -183,6 +183,9 @@ EndIf Var BugFlag = 0 + If RoadShow = "true" Then + Var PriceShowValue = "Free" + EndIf EndIf