pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

renovate remove cup and cup on arm

Browse source
This commit is contained in:
wanlop run 2025-06-04 22:08:49 +07:00
parent 34ceea967c
commit f6a7ec1501
57 changed files with 591 additions and 475 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xml/event/script_common_for_open_promotion_xml.ev
View file

@ -92,9 +92,3 @@ Else
EndIf
EndIf
Var OpenFromPageBoard = 0
If OpenFromMulti = 1 Then
TabMenuVisibleInst 99
EndIf
Var OpenFromMulti = 0

34
xml/menu_catalog_new.xml
View file

@ -75,39 +75,7 @@
; zone cup on arm
If Seeker = "curr" Then
If CupOnArm = "true" Then
If CheckCupStateDoorCupClose = "" Then
If buttonRemoveCup = "Enable" Then
Else
Refresh
EndIf
Var buttonRemoveCup = "Enable"
EndIf
If CheckCupStateDoorCupClose = "done" Then
If buttonRemoveCup = "Enable" Then
Else
Refresh
EndIf
Var buttonRemoveCup = "Enable"
EndIf
Else
If buttonRemoveCup = "Enable" Then
Var buttonRemoveCup = "Invisible"
Refresh
EndIf
EndIf
Else
Var buttonRemoveCup = "Invisible"
EndIf
Var Timeout = Timeout + 1
TimerReset

87
xml/page_board.xml
View file

@ -389,7 +389,6 @@
Var TimerFirst = "true"
Var buttonRemoveCup = "Invisible"
Var led_new = "0"
READ_FILE "/mnt/sdcard/coffeevending/led_new" led_new
@ -1334,8 +1333,26 @@
; New mode
; Inter + Multi-Instance available ./inter/tha/multi
Var EnableMultiInstanceFromBoxID = 0
TRY "ROOT/taobin_project/inter/tha/configure.ev"
DEBUGVAR EnableMultiInstanceFromBoxID
If MAT_ID_2301 = "Enable" Then
If EnableMultiInstanceFromBoxID = 0 Then
If CountUpForRestartApp = "" Then
Var CountUpForRestartApp = 0
EndIf
DEBUGVAR CountUpForRestartApp
Var CountUpForRestartApp = CountUpForRestartApp + 1
If CountUpForRestartApp > 1 Then
WRITE_FILE "/mnt/sdcard/enable_ui_v3" "true"
FINISH
EndIf
EndIf
EndIf
If BoxID = 173372 Then
@ -1580,20 +1597,7 @@
Var bpRemoveCup = CountryRootPath + "/image/main_page/bp_remove_cup.png"
EndIf
If CupOnArm = "true" Then
If CheckCupStateDoorCupClose = "" Then
Var buttonRemoveCup = "Enable"
EndIf
If CheckCupStateDoorCupClose = "done" Then
Var buttonRemoveCup = "Enable"
EndIf
Else
If buttonRemoveCup = "Enable" Then
Var buttonRemoveCup = "Invisible"
EndIf
EndIf
If IgnoreProfileFromRunEV = "" Then
Var IgnoreProfileFromRunEV = 0
@ -1753,10 +1757,14 @@
OpenInst 2 PepsiFullScreenPageBoard
EndIf
If CupOnArm = "true" Then
; tap screen for press popup when app hang
TapScreen 860 1004
Else
; tap screen for press popup when app hang
TapScreen 860 1004
EndIf
Var buttonRemoveCupOnArm = "Invisible"
Var CountDownFailErrorHappendClear = 8
</EventOpen>
@ -1906,17 +1914,17 @@ PRICE "Reset" "-"
</EventUnitTest7>
<EventUnitTest8>
Var buttonRemoveCup = "Enable"
DEBUGVAR buttonRemoveCup
Var buttonRemoveCupOnArm = "Enable"
DEBUGVAR buttonRemoveCupOnArm
DEBUGVAR bnRemoveCup
DEBUGVAR bpRemoveCup
</EventUnitTest8>
<EventUnitTest9>
Var buttonRemoveCup = "Enable"
Var buttonRemoveCupOnArm = "Enable"
Var UseVeryBigRemoveCupButton = "Enable"
DEBUGVAR buttonRemoveCup
DEBUGVAR buttonRemoveCupOnArm
</EventUnitTest9>
@ -1943,10 +1951,14 @@ PRICE "Reset" "-"
DEBUGVAR FailErrorHappend
If FailErrorHappend = 1 Then
If CountDownFailErrorHappendClear > 0 Then
Var CountDownFailErrorHappendClear = CountDownFailErrorHappendClear - 1
If CountDownFailErrorHappendClear = 1 Then
__CMD "error-code-clear-all" "-" "-" "-"
If CupOnArm = "true" Then
Else
If CountDownFailErrorHappendClear > 0 Then
Var CountDownFailErrorHappendClear = CountDownFailErrorHappendClear - 1
If CountDownFailErrorHappendClear = 1 Then
__CMD "error-code-clear-all" "-" "-" "-"
EndIf
EndIf
EndIf
EndIf
@ -2288,23 +2300,7 @@ PRICE "Reset" "-"
EndIf
EndIf
If CupOnArm = "true" Then
If CheckCupStateDoorCupClose = "" Then
Var buttonRemoveCup = "Enable"
EndIf
If CheckCupStateDoorCupClose = "done" Then
Var buttonRemoveCup = "Enable"
EndIf
Else
If buttonRemoveCup = "Enable" Then
Var buttonRemoveCup = "Invisible"
EndIf
EndIf
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
@ -2656,7 +2652,7 @@ PRICE "Reset" "-"
<Button>
<X> btnRemoveCupX </X>
<Y> btnRemoveCupY </Y>
<State> buttonRemoveCup </State>
<State> buttonRemoveCupOnArm </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> bnRemoveCup </Filename>
@ -2666,7 +2662,8 @@ PRICE "Reset" "-"
Machine DoorLidOpen
Var CheckCupStateDoorCupClose = "reset"
Var buttonRemoveCup = "Invisible"
Var buttonRemoveCupOnArm = "Invisible"
RefreshAll
</EventClick>
</Button>
@ -2806,4 +2803,6 @@ PRICE "Reset" "-"
</Text>
;include="ROOT/inc/remove_cup_tag_on_arm.inc"
</Page>

16
xml/page_catalog2.xml
View file

@ -228,21 +228,8 @@
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
; zone cup on arm
If CupOnArm = "true" Then
If CheckCupStateDoorCupClose = "" Then
Var buttonRemoveCup = "Enable"
EndIf
If CheckCupStateDoorCupClose = "done" Then
Var buttonRemoveCup = "Enable"
EndIf
Else
If buttonRemoveCup = "Enable" Then
Var buttonRemoveCup = "Invisible"
EndIf
EndIf
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
If CounterEnable = 1 Then
If OnTaobinVending = 1 Then
@ -695,5 +682,6 @@
Open "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_catalog.xml"
</EventUnitTest4>
;include="ROOT/inc/remove_cup_tag_on_arm.inc"
</Popup>

35
xml/page_catalog3.xml
View file

@ -224,6 +224,10 @@
; zone cup on arm
If Seeker = "curr" Then
Var buttonRemoveCup = "Invisible"
Else
If CupOnArm = "true" Then
If CheckCupStateDoorCupClose = "" Then
@ -234,14 +238,8 @@
Var buttonRemoveCup = "Enable"
EndIf
Else
If buttonRemoveCup = "Enable" Then
Var buttonRemoveCup = "Invisible"
EndIf
EndIf
Else
Var buttonRemoveCup = "Invisible"
EndIf
@ -300,25 +298,7 @@
EndIf
EndIf
; zone cup on arm
If Seeker = "curr" Then
If CupOnArm = "true" Then
If CheckCupStateDoorCupClose = "" Then
Var buttonRemoveCup = "Enable"
EndIf
If CheckCupStateDoorCupClose = "done" Then
Var buttonRemoveCup = "Enable"
EndIf
Else
If buttonRemoveCup = "Enable" Then
Var buttonRemoveCup = "Invisible"
EndIf
EndIf
Else
Var buttonRemoveCup = "Invisible"
EndIf
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
@ -754,4 +734,7 @@
</EventUnitTest4>
;include="ROOT/inc/remove_cup_tag_on_arm.inc"
</Popup>

2
xml/page_catalog_group_recommend.skt
View file

@ -46,7 +46,6 @@
;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
<?hurr
#include=menu_new_layout_gen_v2.py
?>
@ -60,7 +59,6 @@
;BigLogoLayout
;include="ROOT/taobin_project/inc/button_remove_cup.inc"
</Popup>

5
xml/page_catalog_group_recommend.xml
View file

@ -43,6 +43,10 @@
;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
<Timeout> 1000 </Timeout>
<EventTimeout>
SAVELOG "Timeout another tag Timeout another tag Timeout another tag Timeout another tag"
</EventTimeout>
@ -16838,7 +16842,6 @@ Limenade Soda" </Value>
;BigLogoLayout
;include="ROOT/taobin_project/inc/button_remove_cup.inc"
</Popup>

2
xml/page_remove_cup.xml
View file

@ -14,6 +14,8 @@
READ_FILE "/mnt/sdcard/coffeevending/country/short" StrCountryShort
DEBUGVAR StrCountryShort
Var buttonRemoveCupOnArm = "Invisible"
; Don't forget
; This file can open before page_board.xml
If StrCountryShort = "MYS" Then

87
xml/page_thankyouConti.xml
View file

@ -167,10 +167,11 @@
Var buttonRemoveCup = "Invisible"
Var thankyouContiVersion = "TC12 "
Var thankyouContiVersion = "TC13 "
SAVELOG "Thank you conti version " + thankyouContiVersion
SAVELOG "Support NextSmoothie and fix bug next"
SAVELOG "DirImage detele. use DirImage2"
SAVELOG "MenuErrorCode"
DEBUGVAR NextSmoothie
DEBUGVAR Seeker.SmoothieToPayment
@ -210,8 +211,9 @@
If CountDownFailErrorHappendClear = 29 Then
__CMD "CLI" "clear-ice-for-next-drink" "-" "-"
EndIf
If CountDownFailErrorHappendClear = 25 Then
__CMD "error-code-clear-all" "-" "-" "-"
;__CMD "error-code-clear-all" "-" "-" "-"
EndIf
@ -313,6 +315,7 @@
Var PictureFile = PictureFile + "1"
Var PictureFile = PictureFile + PictureEnd
SAVELOG "============ Older condition ================="
DEBUGVAR Seeker.selected_a_drink
If NextOrderStatus = "Disable" Then
Var LastMakeDrinkResult = "fail"
@ -327,54 +330,6 @@
DEBUGVAR CountDownThankyou
; obsolete
If CountDownThankyou = 99 Then
; reset all var
DEBUGVAR MachineStage
SAVELOG "CountDownThankyou = 0"
Var CountDownBrewing = BrewTime
Var CountUpBrewing = 0
SAVELOG BrewTime
Var ShowCountDownBrewing = CountDownBrewing
Var MachineState_Result = 0
If MachineStage = "show-menu" Then
If HaveCup = "false" Then
Var LastMakeDrinkResult = "-"
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
MakeDrinkV1 Seeker.selected_a_drink SelectSugarID
If CountryName = "Thailand" Then
If New_Payment = 1 Then
Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
Else
If InternationalEnable = 1 Then
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter
Else
;obsolete
If New_Payment = 1 Then
Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
EndIf
EndIf
EndIf
EndIf
EndIf
; run test;
If CountDownThankyou = 0 Then
@ -421,8 +376,6 @@
If New_Payment = 1 Then
Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
Else
@ -458,6 +411,7 @@
;include=ROOT/taobin_project/inc/remove_cup_step.inc
If Timeout2 < 3 Then
Var buttonRemoveCup = "Invisible"
EndIf
@ -477,6 +431,7 @@
EndIf
DEBUGVAR MenuReadyForCup
DEBUGVAR MenuErrorCode
If MenuReadyForCup = "YES" Then
@ -515,6 +470,32 @@
Var buttonRemoveCup = "Invisible"
Else
If MenuErrorCode > 0 Then
If Timeout2 > 40 Then
SAVELOG "Timeout2 40 MenuErrorCode not zero"
Var error_code_stop_now = MenuErrorCode
If DoorCupPosition = "bottom" Then
Else
Var error_code_stop_now = 1296
__CMD "error-code-1296" 0 "-" "-"
EndIf
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
Var LastMakeDrinkResult = "fail"
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
EndIf
EndIf
EndIf

2
xml/page_topping_select7.xml
View file

@ -12,6 +12,8 @@
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
EndIf
Machine WakeUp
Var EndOfTopping = 0
Var Seeker.orderFromNewTopping = 0

6
xml/topview2.xml
View file

@ -793,4 +793,10 @@
</ListView1>
;
;include="ROOT/taobin_project/inc/button_remove_cup.inc"
</Popup>

10
xml/vending_info.xml
View file

@ -185,6 +185,14 @@
Var CountTouchButton = 0
DEBUGVAR FrontDoorVersionInt
If FrontDoorVersionInt > 2000 Then
Var EnableTestRGB = "Enable"
Else
Var EnableTestRGB = "Invisible"
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -1041,6 +1049,7 @@
<Image>
<X> info2_startX </X>
<Y> info_15Y </Y>
<State> EnableTestRGB </State>
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
<EventClick>
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_test_color.xml"
@ -1051,6 +1060,7 @@
<X> info2_text_startX </X>
<Y> info_text_15Y </Y>
<Size> 30 </Size>
<State> EnableTestRGB </State>
<Font> fontType1 </Font>
<Color> 0x000000 </Color>
<Value> "Test RGB" </Value>