Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
wanlop run 2025-07-17 11:20:46 +07:00
commit ae8ac858a1
38 changed files with 156773 additions and 143995 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Before After
Before After

View file

@ -15,6 +15,7 @@
Var ProductDesc = "" Var ProductDesc = ""
Var Timeout = 0 Var Timeout = 0
Var TimeoutAfterShowQR = 0
Var service = "eInvoice.mys" Var service = "eInvoice.mys"
Var EReceiptQR = "" Var EReceiptQR = ""
@ -82,9 +83,13 @@
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
DEBUGVAR TimeoutAfterShowQR
DEBUGVAR VendingTSID DEBUGVAR VendingTSID
Var Seeker.VendingTSID = VendingTSID If VendingTSID = "" Then
Else
Var Seeker.VendingTSID = VendingTSID
EndIf
DEBUGVAR Seeker.VendingTSID DEBUGVAR Seeker.VendingTSID
DEBUGVAR LOADING_STATE DEBUGVAR LOADING_STATE
@ -93,31 +98,43 @@ DEBUGVAR QR_STATE
DEBUGVAR Seeker.e_receipt DEBUGVAR Seeker.e_receipt
Var Timeout = Timeout + 1 If Seeker.VendingTSID = "" Then
Var Timeout = Timeout + 1
Else
If TimeoutAfterShowQR = 0 Then
Var LOADING_STATE = "Invisible"
SAVELOG "TSID should be ready!"
TRY "ROOT/taobin_project/inter/mys/xml/process/e_receipt.ev"
Var TimeoutAfterShowQR = 1
Refresh
EndIf
EndIf
If Timeout = 5 Then If Seeker.VendingTSID = "" Then
Var LOADING_STATE = "Invisible" Var QR_STATE = "Invisible"
SAVELOG "TSID should be ready!" Refresh
TRY "ROOT/taobin_project/inter/mys/xml/process/e_receipt.ev" Else
If TimeoutAfterShowQR > 2 Then
Var QR_STATE = "Enable"
EndIf
If TimeoutAfterShowQR > 0 Then
Var TimeoutAfterShowQR = TimeoutAfterShowQR + 1
EndIf
Refresh Refresh
EndIf EndIf
If Timeout > 5 Then If Timeout > 25 Then
Var QR_STATE = "Enable" SAVELOG "Timeout after waiting .."
Refresh
EndIf
If Timeout > 15 Then
Open "ROOT/taobin_project/xml/page_drinkok.xml" Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf EndIf
If TimeoutAfterShowQR > 25 Then
SAVELOG "Timeout QR OK"
Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf
Refresh Refresh
TimerReset TimerReset
@ -143,10 +160,10 @@ TimerReset
; need-change-position ; need-change-position
<QRCode> <QRCode>
<X> 415 </X> <X> 350 </X>
<Y> 875 </Y> <Y> 845 </Y>
<Width> 250 </Width> <Width> 360 </Width>
<Height> 250 </Height> <Height> 360 </Height>
<State> QR_STATE </State> <State> QR_STATE </State>
<Service> service </Service> <Service> service </Service>
</QRCode> </QRCode>
@ -155,7 +172,7 @@ TimerReset
<Image> <Image>
<X> 175 </X> <X> 175 </X>
<Y> 1200 </Y> <Y> 1230 </Y>
<Height> 300 </Height> <Height> 300 </Height>
<Width> 320 </Width> <Width> 320 </Width>
<Filename> Seeker.PictureDrink </Filename> <Filename> Seeker.PictureDrink </Filename>

View file

@ -885,3 +885,9 @@ PEPSI Max BANANA 52-05-02-0077 1 14 56 23 13 24 120 14:00 23
PEPSI Max YUZU 52-05-02-0076 1 14 53 23 13 24 120 4:00 23 PEPSI Max YUZU 52-05-02-0076 1 14 53 23 13 24 120 4:00 23
PEPSI MINT 52-05-02-0068 1 14 59 12 23 24 120 15:00 23 PEPSI MINT 52-05-02-0068 1 14 59 12 23 24 120 15:00 23
Almost Dirty 52-21-02-0071 1 2 3 4 5 6 7 24 66 6:06 32 Almost Dirty 52-21-02-0071 1 2 3 4 5 6 7 24 66 6:06 32
ICED SANTA GINGER 12-03-02-0081 1 7 22 23 24 49 10:01 23
ICED SANTA GINGER 12-23-02-0081 1 7 22 23 24 49 10:01 23
CHOCO SNOWFLAKE SMOOTHIE 12-03-03-0088 1 15 7 22 40 41 24 49 10:01 23
REINDEER PEPPERMINT SMOOTHIE 12-03-03-0089 1 59 7 19 41 24 49 10:01 23
ICED CHRISTMAS CAFE LATTE 12-01-02-0084 1 6 7 12 22 23 24 49 10:01 23
ICED CHRISTMAS CAFE LATTE 12-21-02-0084 1 6 7 12 22 23 24 49 10:01 23

Can't render this file because it has a wrong number of fields in line 40.

View file

@ -22,6 +22,8 @@
Var ice_tab_process_show = "Invisible" Var ice_tab_process_show = "Invisible"
EndIf EndIf
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
If NextPage = "-" Then If NextPage = "-" Then

View file

@ -850,6 +850,8 @@
}) })
def GenMenuBlock(spl, idx_hot_product_code, idx_cold_product_code, idx_blend_product_code): def GenMenuBlock(spl, idx_hot_product_code, idx_cold_product_code, idx_blend_product_code):
if "skip_blend" in param:
spl[ idx_name][ idx_blend_product_code] = "-"
GenMenuProductCodeBlock(spl, spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code] ) GenMenuProductCodeBlock(spl, spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code] )
@ -1027,6 +1029,8 @@
print("\t\t==> ignore ") print("\t\t==> ignore ")
else: else:
print("\t\t==> gen ") print("\t\t==> gen ")
if "skip_blend" in param:
blend_pd[ idx] = "-"
GenMenuProductCodeBlock(spl, hot_pd[ idx], cold_pd[ idx], blend_pd[ idx] ) GenMenuProductCodeBlock(spl, hot_pd[ idx], cold_pd[ idx], blend_pd[ idx] )
else: else:
GenMenuBlock(spl, idx_hot_product_code, idx_cold_product_code, idx_blend_product_code) GenMenuBlock(spl, idx_hot_product_code, idx_cold_product_code, idx_blend_product_code)
@ -1092,6 +1096,8 @@
out_xml('\tOpen "ROOT/taobin_project/xml/page_payment_multi.xml"\r\n') out_xml('\tOpen "ROOT/taobin_project/xml/page_payment_multi.xml"\r\n')
out_xml('</EventClick>\r\n') out_xml('</EventClick>\r\n')
out_xml('</Button>\r\n') out_xml('</Button>\r\n')
out_xml(';include="ROOT/taobin_project/inc/button_remove_cup.inc"\r\n')
# if "v2" in param: # if "v2" in param:

View file

@ -219,6 +219,8 @@
Var ice_tab_process_show = "Invisible" Var ice_tab_process_show = "Invisible"
EndIf EndIf
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
If NextPage = "-" Then If NextPage = "-" Then
@ -2089,6 +2091,7 @@
Open "ROOT/taobin_project/xml/page_payment_multi.xml" Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick> </EventClick>
</Button> </Button>
;include="ROOT/taobin_project/inc/button_remove_cup.inc"

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -211,6 +211,8 @@
Var ice_tab_process_show = "Invisible" Var ice_tab_process_show = "Invisible"
EndIf EndIf
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
If NextPage = "-" Then If NextPage = "-" Then
@ -8190,6 +8192,7 @@
Open "ROOT/taobin_project/xml/page_payment_multi.xml" Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick> </EventClick>
</Button> </Button>
;include="ROOT/taobin_project/inc/button_remove_cup.inc"

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -216,6 +216,8 @@
Var ice_tab_process_show = "Invisible" Var ice_tab_process_show = "Invisible"
EndIf EndIf
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
If NextPage = "-" Then If NextPage = "-" Then
@ -5465,6 +5467,7 @@
Open "ROOT/taobin_project/xml/page_payment_multi.xml" Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick> </EventClick>
</Button> </Button>
;include="ROOT/taobin_project/inc/button_remove_cup.inc"

View file

@ -229,23 +229,7 @@
EndIf EndIf
EndIf EndIf
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
; 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
Refresh Refresh
@ -711,6 +695,8 @@
<Value> ShowNetworkProblemText </Value> <Value> ShowNetworkProblemText </Value>
</Text> </Text>
;include="ROOT/taobin_project/inc/button_remove_cup.inc"
; Cart ; Cart
<Button> <Button>
<X> 915 </X> <X> 915 </X>
@ -801,5 +787,6 @@
DEBUGVAR buttonRemoveCup DEBUGVAR buttonRemoveCup
</EventUnitTest3> </EventUnitTest3>
;include="ROOT/inc/remove_cup_tag_on_arm.inc"
</Popup> </Popup>

View file

@ -852,7 +852,8 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES
EndIf EndIf
If BREW_CNT = 0 Then If BREW_CNT = 0 Then

View file

@ -309,7 +309,8 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES
EndIf EndIf
If CountDownBrewing = 0 Then If CountDownBrewing = 0 Then

View file

@ -932,7 +932,7 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
LEDv2 LED_POS On 100 20 0 LED_TIMES LED_DIM_TIMES ;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES
EndIf EndIf
DEBUGVAR EnableDoubleCupNoError DEBUGVAR EnableDoubleCupNoError

View file

@ -397,8 +397,8 @@
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
LEDv2 LED_POS On 100 20 0 LED_TIMES LED_DIM_TIMES ;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES
EndIf EndIf

View file

@ -50,7 +50,7 @@
DEBUGVAR Timeout DEBUGVAR Timeout
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
EndIf EndIf
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1

View file

@ -154,7 +154,7 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
EndIf EndIf
StrLen TelephoneNumber TelNumLen StrLen TelephoneNumber TelNumLen

View file

@ -243,7 +243,7 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
EndIf EndIf

View file

@ -77,7 +77,7 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
EndIf EndIf

View file

@ -975,7 +975,7 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
EndIf EndIf

View file

@ -959,7 +959,7 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
EndIf EndIf

View file

@ -1058,7 +1058,7 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
EndIf EndIf

View file

@ -95,7 +95,7 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
EndIf EndIf
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1

View file

@ -331,7 +331,7 @@
EndIf EndIf
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
LEDv4Playlist "reset" "-" "-" ;LEDv4Playlist "reset" "-" "-"
TRY "ROOT/taobin_project/xml/process/temp_ledv4_page_drinkok.ev" TRY "ROOT/taobin_project/xml/process/temp_ledv4_page_drinkok.ev"
EndIf EndIf

View file

@ -35,6 +35,13 @@
Var bn_off = TestColorImageDir + "bn_off.png" Var bn_off = TestColorImageDir + "bn_off.png"
Var bp_off = TestColorImageDir + "bp_off.png" Var bp_off = TestColorImageDir + "bp_off.png"
Var bn_10s = TestColorImageDir + "bn_10s.png"
Var bp_10s = TestColorImageDir + "bp_10s.png"
Var bn_20s = TestColorImageDir + "bn_20s.png"
Var bp_20s = TestColorImageDir + "bp_20s.png"
Var bn_60s = TestColorImageDir + "bn_60s.png"
Var bp_60s = TestColorImageDir + "bp_60s.png"
Var bn_toggle_off = TestColorImageDir + "btn_toggle_off.png" Var bn_toggle_off = TestColorImageDir + "btn_toggle_off.png"
Var bn_toggle_on = TestColorImageDir + "btn_toggle_on.png" Var bn_toggle_on = TestColorImageDir + "btn_toggle_on.png"
@ -181,7 +188,7 @@
Var LEDv4Toggle[41] = "Enable" Var LEDv4Toggle[41] = "Enable"
Var LEDv4Toggle[42] = "Enable" Var LEDv4Toggle[42] = "Enable"
Var PlayTestLEDv4 = "false"
</EventOpen> </EventOpen>
@ -189,7 +196,36 @@
<EventTimeout> <EventTimeout>
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
If Timeout > 60 Then DEBUGVAR CountDownBrewing
DEBUGVAR LEDv4PlaylistStatus
DEBUGVAR PlayTestLEDv4
DEBUGVAR LEDv4CountDownValue
DEBUGVAR GEN4_POS
If CountDownBrewing > 0 Then
Var CountDownBrewing = CountDownBrewing - 1
Else
If PlayTestLEDv4 = "true" Then
LEDv4Playlist "reset" "-" "-"
EndIf
Var PlayTestLEDv4 = "false"
EndIf
If PlayTestLEDv4 = "true" Then
; check-playlist-state
If LEDv4PlaylistStatus = "Ready" Then
LEDv4Playlist "play" "-" "-"
EndIf
If LEDv4PlaylistStatus = "Running" Then
;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES
EndIf
EndIf
If Timeout > 120 Then
Open "ROOT/taobin_project/xml/vending_info.xml" Open "ROOT/taobin_project/xml/vending_info.xml"
EndIf EndIf
@ -2241,4 +2277,26 @@ Var Timeout = 0
</EventClick> </EventClick>
</Button> </Button>
<Button>
<X> LEDv4HorizontalX1 </X>
<Y> 700 </Y>
<Filename> bn_10s </Filename>
<FilenamePress> bp_10s </FilenamePress>
<EventClick>
LEDv2 LedV4Top Off 0 0 0 1 0
LEDv2 LedV4Mid Off 0 0 0 1 0
Var CountDownBrewing = 10
Var Timeout = 0
LEDv4Playlist "new" "XX-XX-XX-TEST" CountDownBrewing
Var PlayTestLEDv4 = "true"
SAVELOG "TestLEDAnime60s"
</EventClick>
</Button>
</Page> </Page>

View file

@ -221,7 +221,7 @@
Var CountDownBrewing = BREW_CNT Var CountDownBrewing = BREW_CNT
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
Var TimeoutThankyou = TimeoutThankyou + 1 Var TimeoutThankyou = TimeoutThankyou + 1
If TimeoutThankyou = TimeoutToNext Then If TimeoutThankyou = TimeoutToNext Then

View file

@ -17,7 +17,7 @@
SAVELOG BrewTime SAVELOG BrewTime
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
Var Timeout = 0 Var Timeout = 0
Var ChangeFlag = 0 Var ChangeFlag = 0
@ -348,7 +348,7 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
Var MachineState_Result = 0 Var MachineState_Result = 0
@ -416,7 +416,7 @@
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
;include=ROOT/taobin_project/inc/remove_cup_step.inc ;include=ROOT/taobin_project/inc/remove_cup_step.inc

View file

@ -135,7 +135,7 @@
SAVELOG BrewTime SAVELOG BrewTime
Var ShowCountDownBrewing = CountDownBrewing Var ShowCountDownBrewing = CountDownBrewing
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
Open "ROOT/taobin_project/xml/page_brewing3Multi.xml" Open "ROOT/taobin_project/xml/page_brewing3Multi.xml"

View file

@ -2,7 +2,7 @@ DEBUGVAR FrontDoorVersionInt
If FrontDoorVersionInt > 19999 Then If FrontDoorVersionInt > 19999 Then
DEBUGVAR StartLEDBrewingAnimation DEBUGVAR StartLEDBrewingAnimation
If StartLEDBrewingAnimation = 0 Then If StartLEDBrewingAnimation = 0 Then
LEDv4Playlist "new" Seeker.selected_a_drink CountDownBrewing ;LEDv4Playlist "new" Seeker.selected_a_drink CountDownBrewing
Var StartLEDBrewingAnimation = 1 Var StartLEDBrewingAnimation = 1
EndIf EndIf
@ -17,7 +17,7 @@ If FrontDoorVersionInt > 19999 Then
Else Else
; ;
If LEDv4PlaylistStatus = "Running" Then If LEDv4PlaylistStatus = "Running" Then
;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES
Else Else
LEDv4Playlist "pause" "processEv" "_notReady" LEDv4Playlist "pause" "processEv" "_notReady"
EndIf EndIf

View file

@ -9,5 +9,4 @@ If FrontDoorVersionInt > 19999 Then
SAVELOG "LEDv4.PageThankYou" SAVELOG "LEDv4.PageThankYou"
Var
EndIf EndIf

View file

@ -28,5 +28,10 @@
"enable": true, "enable": true,
"except": [], "except": [],
"modifiers": [] "modifiers": []
},
"y18IDCardExSodaTeaMilk": {
"enable": true,
"except": [],
"modifiers": []
} }
} }

File diff suppressed because it is too large Load diff

View file

@ -1547,7 +1547,7 @@
}, },
{ {
"productCode": "12-05-03-0034", "productCode": "12-05-03-0034",
"enable": false "enable": true
}, },
{ {
"productCode": "12-05-03-0035", "productCode": "12-05-03-0035",