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

Merge branch 'masterpiece' of ssh://192.168.10.159/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
Ittipat Lusuk 2025-05-15 15:55:06 +07:00
commit ce02726c99
13 changed files with 76 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xml/page_NewBrewing3.xml
View file

@ -290,7 +290,7 @@
If ConnectWithPOSMachine = 1 Then
If POS_SELL_STATUS = "NORMAL" Then
If POS_SELL_MODE = "NORMAL" Then
Else
Var SelectMenuBetweenBrewEnable1 = "Invisible"
@ -1422,7 +1422,7 @@
If SelectMenuBetweenBrewEnable1 = "Enable" Then
If ConnectWithPOSMachine = 1 Then
If POS_SELL_STATUS = "NORMAL" Then
If POS_SELL_MODE = "NORMAL" Then
Else
Var SelectMenuBetweenBrewEnable1 = "Invisible"
EndIf

4
xml/page_NewBrewing3Conti.xml
View file

@ -56,7 +56,7 @@
EndIf
If ConnectWithPOSMachine = 1 Then
If POS_SELL_STATUS = "NORMAL" Then
If POS_SELL_MODE = "NORMAL" Then
Else
Var EnableSelectMenuBetweenBrew = "Invisible"
@ -594,7 +594,7 @@
If EnableSelectMenuBetweenBrew = "Enable" Then
If ConnectWithPOSMachine = 1 Then
If POS_SELL_STATUS = "NORMAL" Then
If POS_SELL_MODE = "NORMAL" Then
Else
Var EnableSelectMenuBetweenBrew = "Invisible"

20
xml/page_board.xml
View file

@ -2133,14 +2133,7 @@ PRICE "Reset" "-"
Var OpenFromPageBoard = 1
If DoorCupPosition = "bottom" Then
If CupOnArm = "true" Then
Else
__CMD "CLI" "arm_id=3,arm_position=posi_espresso_ii" "-" "-"
EndIf
EndIf
DEBUGVAR InternationalEnable
@ -2149,6 +2142,17 @@ PRICE "Reset" "-"
If CurrHelpCenter = 1 Then
OpenInst 0 "ROOT/taobin_project/xml/page_board.xml"
Else
If DoorCupPosition = "bottom" Then
If CupOnArm = "true" Then
Else
__CMD "CLI" "arm_id=3,arm_position=posi_espresso_ii" "-" "-"
EndIf
EndIf
Var BaseOnPageBoard = 0
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"

11
xml/page_payment.xml
View file

@ -247,8 +247,14 @@
Var ReadyForBrew = "false"
EndIf
READ_FILE "/mnt/sdcard/coffeevending/app_manager/app_list/king_power_service/enable" POSMachineFlag
DEBUGVAR POSMachineFlag
If POSMachineFlag = 1 Then
Var ConnectWithPOSMachine = 1
EndIf
If ConnectWithPOSMachine = 1 Then
If POS_SELL_STATUS = "NORMAL" Then
If POS_SELL_MODE = "NORMAL" Then
Else
If Seeker = "next" Then
@ -409,6 +415,7 @@
Var param2 = PureName
EndIf
DEBUGVAR ConnectWithPOSMachine
If ConnectWithPOSMachine = 1 Then
Var WaitPOSStatus = 1
Var TimeWaitPOSStatus = 0
@ -514,6 +521,8 @@
If WaitPOSStatus = 1 Then
DEBUGVAR TimeWaitPOSStatus
DEBUGVAR POS_SELL_STATUS
If TimeWaitPOSStatus < 10 Then
Var TimeWaitPOSStatus = TimeWaitPOSStatus + 1

52
xml/page_thankyouConti.xml
View file

@ -60,14 +60,12 @@
Var BottomText = PicturePath + "text_bottom_eng.png"
Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr"
EndIf
If LanguageShow = "MSC" Then
Var BottomText = PicturePath + "text_bottom_eng.png"
Var DirImage = "ROOT/taobin_project/image/page_thankyou_msc"
EndIf
;DEBUGVAR StarwState
@ -117,24 +115,42 @@
DEBUGVAR MachineStage
DEBUGVAR NextOrderStatus
; Default dir image
Var DirImage = "ROOT/taobin_project/image/complete/"
Var DirImage2 = "ROOT/taobin_project/image/complete_en/"
If InternationalEnable = 1 Then
If LanguageShow = "THAI" Then
Var DirImage2 = "ROOT/taobin_project/image/complete/"
EndIf
If LanguageShow = "ENG" Then
Var DirImage2 = "ROOT/taobin_project/image/complete_en/"
EndIf
;inter-image
If LanguageShow = "MYANMAR" Then
Var DirImage2 = "ROOT/taobin_project/image/complete_mmr/"
EndIf
If LanguageShow = "MSC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_msc/"
EndIf
If LanguageShow = "MTC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_mtc/"
EndIf
Else
If show_eng = "true" Then
Else
Var DirImage2 = "ROOT/taobin_project/image/complete/"
EndIf
If LanguageShow = "ENG" Then
Var DirImage = "ROOT/taobin_project/image/complete_en/"
EndIf
;inter-image
If LanguageShow = "MYANMAR" Then
Var DirImage2 = "ROOT/taobin_project/image/complete_mmr/"
EndIf
If LanguageShow = "MSC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_msc/"
EndIf
If LanguageShow = "MTC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_mtc/"
EndIf
Var txtDrinkOKState = "Invisible"
Var buttonRemoveCup = "Invisible"
@ -151,8 +167,10 @@
Var buttonRemoveCup = "Invisible"
SAVELOG "Thank you conti version TCV9"
Var thankyouContiVersion = "TCV9 "
SAVELOG "Thank you conti version " + thankyouContiVersion
SAVELOG "Support NextSmoothie and fix bug next"
SAVELOG "DirImage detele. use DirImage2"
DEBUGVAR NextSmoothie
DEBUGVAR Seeker.SmoothieToPayment
@ -559,7 +577,7 @@
<Width> 1080 </Width>
<Align> end </Align>
<Color> 0xFF0000 </Color>
<Value> "TCT6 "</Value>
<Value> thankyouContiVersion </Value>
</Text>

4
xml/page_topping_select8.xml
View file

@ -853,8 +853,8 @@
TRY "ROOT/taobin_project/speical/call_from_topping.ev"
DEBUGVAR $12-02-03-0043.Name
DEBUGVAR $12-02-03-0043.NameE
DEBUGVAR SpeicalButtonPositionX
DEBUGVAR TextShowSpecialButton
If show_eng = "true" Then
Var showname = NameDrink