THAI: Fix bug topping select press next button very fast, fix bug page_payment_cash to wait 3 second before send cancel action

This commit is contained in:
Kenta420 2024-11-27 16:36:20 +07:00
parent 9495125017
commit 207100665f
2 changed files with 434 additions and 375 deletions

View file

@ -182,6 +182,7 @@
Var Seeker.VendingDiscount = DiscountDrink Var Seeker.VendingDiscount = DiscountDrink
Var CancelingPopupFlag = "Invisible" Var CancelingPopupFlag = "Invisible"
Var SendCancelActionFlag = 0
Var CancelingPopupCountDown = 0 Var CancelingPopupCountDown = 0
Var CashTextWarning = "" Var CashTextWarning = ""
@ -2244,14 +2245,38 @@
If CancelingPopupFlag = "Enable" Then If CancelingPopupFlag = "Enable" Then
SAVELOG "Canceled Popup"
Var CancelingPopupCountDown = CancelingPopupCountDown + 1 Var CancelingPopupCountDown = CancelingPopupCountDown + 1
DEBUGVAR CancelingPopupCountDown
If CancelingPopupCountDown > 3 Then 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
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
EndIf
EndIf
If CancelingPopupCountDown > 5 Then
SAVELOG "Close Cancel Popup"
Var CancelingPopupFlag = "Invisible" Var CancelingPopupFlag = "Invisible"
Var alphaState = "Invisible" Var alphaState = "Invisible"
Var SendCancelActionFlag = 0
EndIf EndIf
EndIf EndIf
@ -3101,20 +3126,6 @@ eval(
Var CancelingPopupFlag = "Enable" Var CancelingPopupFlag = "Enable"
Var CancelingPopupCountDown = 0 Var CancelingPopupCountDown = 0
If QRPopupOpenFlag = 1 Then
VendingQR OFF
EndIf
If ReqPayInfoFromCashOther = 2 Then
DEBUGVAR "CashlessReq OFF by user"
CashlessReq OFF
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
Refresh Refresh
EndIf EndIf
</EventClick> </EventClick>

View file

@ -72,6 +72,8 @@
Var SugarState5 = "Invisible" Var SugarState5 = "Invisible"
Var SugarState6 = "Invisible" Var SugarState6 = "Invisible"
Var ReadyToGoNext = 0
Var AddShotEnable = "Invisible" Var AddShotEnable = "Invisible"
Var BGSugar = "Invisible" Var BGSugar = "Invisible"
@ -346,6 +348,7 @@
EndIf EndIf
Var ReadyToGoNext = 0
Function 2 Function 2
Else Else
@ -955,6 +958,7 @@
Var OatMilkX = 270 Var OatMilkX = 270
EndIf EndIf
Var ReadyToGoNext = 0
Function 2 Function 2
@ -2479,6 +2483,7 @@
TRY "/mnt/sdcard/coffeevending/taobin_project/flash_deal/topping_page.ev" TRY "/mnt/sdcard/coffeevending/taobin_project/flash_deal/topping_page.ev"
Var ReadyToGoNext = 0
Function 2 Function 2
EndIf EndIf
@ -2900,6 +2905,7 @@
DEBUGVAR topping1 DEBUGVAR topping1
Var ReadyToGoNext = 0
Function 2 Function 2
Refresh Refresh
@ -3381,6 +3387,7 @@
DEBUGVAR topping1 DEBUGVAR topping1
Var ReadyToGoNext = 0
Function 2 Function 2
Refresh Refresh
@ -3614,6 +3621,7 @@
DEBUGVAR topping1 DEBUGVAR topping1
Var ReadyToGoNext = 0
Function 2 Function 2
Refresh Refresh
@ -3831,6 +3839,7 @@
Var SugarNormalCheck = "PressForever" Var SugarNormalCheck = "PressForever"
EndIf EndIf
Var ReadyToGoNext = 0
Function 2 Function 2
EndIf EndIf
@ -3865,6 +3874,7 @@
Var SugarZeroCalCheck = "PressForever" Var SugarZeroCalCheck = "PressForever"
EndIf EndIf
Var ReadyToGoNext = 0
Function 2 Function 2
EndIf EndIf
@ -3941,6 +3951,7 @@
DEBUGVAR SugarZeroCalCheck DEBUGVAR SugarZeroCalCheck
Var ReadyToGoNext = 0
Function 2 Function 2
EndIf EndIf
@ -4451,6 +4462,7 @@
Var SugarNormalCheck = "PressForever" Var SugarNormalCheck = "PressForever"
EndIf EndIf
Var ReadyToGoNext = 0
Function 2 Function 2
EndIf EndIf
@ -4485,6 +4497,7 @@
Var SugarZeroCalCheck = "PressForever" Var SugarZeroCalCheck = "PressForever"
EndIf EndIf
Var ReadyToGoNext = 0
Function 2 Function 2
EndIf EndIf
@ -4553,6 +4566,7 @@
Var SugarZeroCalCheck = "Disable" Var SugarZeroCalCheck = "Disable"
EndIf EndIf
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
Var ReadyToGoNext = 0
Function 2 Function 2
EndIf EndIf
@ -4773,6 +4787,7 @@
Var SugarNormalCheck = "PressForever" Var SugarNormalCheck = "PressForever"
EndIf EndIf
Var ReadyToGoNext = 0
Function 2 Function 2
EndIf EndIf
@ -4807,6 +4822,7 @@
Var SugarZeroCalCheck = "PressForever" Var SugarZeroCalCheck = "PressForever"
EndIf EndIf
Var ReadyToGoNext = 0
Function 2 Function 2
EndIf EndIf
@ -4878,6 +4894,7 @@
EndIf EndIf
Var UserSeletedSugar = 1 Var UserSeletedSugar = 1
Var ReadyToGoNext = 0
Function 2 Function 2
EndIf EndIf
@ -5243,6 +5260,7 @@
Var OatMilkEnable = "Press" Var OatMilkEnable = "Press"
EndIf EndIf
Var ReadyToGoNext = 0
Function 2 Function 2
@ -5269,6 +5287,7 @@
Var OatMilkEnable = "Press" Var OatMilkEnable = "Press"
EndIf EndIf
Var ReadyToGoNext = 0
Function 2 Function 2
@ -5375,6 +5394,7 @@
Var ShotCoffeePremium = "Press" Var ShotCoffeePremium = "Press"
EndIf EndIf
Var ReadyToGoNext = 0
Function 2 Function 2
Refresh Refresh
@ -5401,6 +5421,7 @@
Var ShotCoffeePremium = "Press" Var ShotCoffeePremium = "Press"
EndIf EndIf
Var ReadyToGoNext = 0
Function 2 Function 2
Refresh Refresh
@ -5455,6 +5476,7 @@
Var showShotEnable = "Press" Var showShotEnable = "Press"
EndIf EndIf
Var ReadyToGoNext = 0
Function 2 Function 2
Refresh Refresh
@ -5487,6 +5509,7 @@
Var showShotEnable = "Press" Var showShotEnable = "Press"
EndIf EndIf
Var ReadyToGoNext = 0
Function 2 Function 2
Refresh Refresh
@ -5553,6 +5576,7 @@
Var showOreoAddEnable = "Press" Var showOreoAddEnable = "Press"
EndIf EndIf
Var ReadyToGoNext = 0
Function 2 Function 2
Refresh Refresh
@ -5585,6 +5609,7 @@
Var showOreoAddEnable = "Press" Var showOreoAddEnable = "Press"
EndIf EndIf
Var ReadyToGoNext = 0
Function 2 Function 2
@ -5649,6 +5674,7 @@
Var CollagenState = "Press" Var CollagenState = "Press"
EndIf EndIf
Var ReadyToGoNext = 0
Function 2 Function 2
Refresh Refresh
@ -5683,6 +5709,7 @@
Var CollagenState = "Press" Var CollagenState = "Press"
EndIf EndIf
Var ReadyToGoNext = 0
Function 2 Function 2
@ -5795,6 +5822,7 @@
Var CurrentCoffeeWaterId = toppingID7index1 Var CurrentCoffeeWaterId = toppingID7index1
Var ReadyToGoNext = 0
Function 2 Function 2
</EventClick> </EventClick>
@ -5820,6 +5848,7 @@
Var CurrentCoffeeWaterId = toppingID7index2 Var CurrentCoffeeWaterId = toppingID7index2
Var ReadyToGoNext = 0
Function 2 Function 2
@ -5846,6 +5875,7 @@
Var CurrentCoffeeWaterId = toppingID7index3 Var CurrentCoffeeWaterId = toppingID7index3
Var ReadyToGoNext = 0
Function 2 Function 2
@ -5872,6 +5902,7 @@
Var CurrentCoffeeWaterId = toppingID7index4 Var CurrentCoffeeWaterId = toppingID7index4
Var ReadyToGoNext = 0
Function 2 Function 2
@ -5897,6 +5928,7 @@
Var CurrentCoffeeWaterId = toppingID7index5 Var CurrentCoffeeWaterId = toppingID7index5
Var ReadyToGoNext = 0
Function 2 Function 2
@ -5986,6 +6018,7 @@
Var CurrentCoffeeQuantityId = toppingID8index1 Var CurrentCoffeeQuantityId = toppingID8index1
Var ReadyToGoNext = 0
Function 2 Function 2
@ -6010,6 +6043,7 @@
Var CurrentCoffeeQuantityId = toppingID8index2 Var CurrentCoffeeQuantityId = toppingID8index2
Var ReadyToGoNext = 0
Function 2 Function 2
@ -6033,6 +6067,7 @@
Var CurrentCoffeeQuantityId = toppingID8index3 Var CurrentCoffeeQuantityId = toppingID8index3
Var ReadyToGoNext = 0
Function 2 Function 2
@ -6121,6 +6156,7 @@
Var CurrentCoffeeLevelId = toppingID9index1 Var CurrentCoffeeLevelId = toppingID9index1
Var ReadyToGoNext = 0
Function 2 Function 2
@ -6146,6 +6182,7 @@
Var CurrentCoffeeLevelId = toppingID9index2 Var CurrentCoffeeLevelId = toppingID9index2
Var ReadyToGoNext = 0
Function 2 Function 2
@ -6171,6 +6208,7 @@
Var CurrentCoffeeLevelId = toppingID9index3 Var CurrentCoffeeLevelId = toppingID9index3
Var ReadyToGoNext = 0
Function 2 Function 2
@ -6197,6 +6235,7 @@
Var CurrentCoffeeLevelId = toppingID9index4 Var CurrentCoffeeLevelId = toppingID9index4
Var ReadyToGoNext = 0
Function 2 Function 2
@ -6318,6 +6357,7 @@
Var CurrentCoffeeTampingId = toppingID8index1 Var CurrentCoffeeTampingId = toppingID8index1
Var ReadyToGoNext = 0
Function 2 Function 2
@ -6341,6 +6381,7 @@
Var CurrentCoffeeTampingId = toppingID8index2 Var CurrentCoffeeTampingId = toppingID8index2
Var ReadyToGoNext = 0
Function 2 Function 2
@ -6366,6 +6407,7 @@
Var CurrentCoffeeTampingId = toppingID8index3 Var CurrentCoffeeTampingId = toppingID8index3
Var ReadyToGoNext = 0
Function 2 Function 2
@ -6492,6 +6534,7 @@
<EventClick> <EventClick>
If ReadyToGoNext = 1 Then
;Var Seeker = "curr" ;Var Seeker = "curr"
Var Timeout = 0 Var Timeout = 0
@ -6839,7 +6882,7 @@
Var LastTimeClickOrder = 0 Var LastTimeClickOrder = 0
EndIf
</EventClick> </EventClick>
</Button> </Button>
@ -7960,6 +8003,8 @@
Var Timeout = 0 Var Timeout = 0
Var ReadyToGoNext = 1
RefreshAll RefreshAll
</Function2> </Function2>
@ -8043,6 +8088,7 @@
Var high_light_drink_type = "Invisible" Var high_light_drink_type = "Invisible"
Var ReadyToGoNext = 0
Function 2 Function 2
@ -8081,6 +8127,7 @@
Var PriceDrinkNoTop = PriceD2 Var PriceDrinkNoTop = PriceD2
Var ReadyToGoNext = 0
Function 2 Function 2
@ -8117,6 +8164,7 @@
Var PriceDrinkNoTop = PriceD3 Var PriceDrinkNoTop = PriceD3
Var ReadyToGoNext = 0
Function 2 Function 2