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

.91

Browse source
This commit is contained in:
wanlop run 2025-05-15 14:39:11 +07:00
parent 7285e9dc72
commit d23e427b6d
10 changed files with 62 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
inter/tha/menu/lang.tsv
View file

@ -1282,7 +1282,7 @@
1300016 Brew time:sec เวลาชง: วินาที
1300017 Test grind sizes ทดสอบขนาดบด
1300018 Coffee module type : ประเภทชุดกาแฟ :
1300019 1. Select grind sizes 1. เลือกขนาดการบด
1300019 1. Select grind sizes 1. เลือกขนาดบด
1300020 More coarse หยาบขึ้น
1300021 More fine ละเอียดขึ้น
1300022 2. Test grinding 2. ทดสอบการบด
@ -1301,7 +1301,7 @@
1300035 Recipes สูตรอาหาร
1300036 Save editing บันทึกการแก้ไข
1300037 Cancel edting ยกเลิกการแก้ไข
1300038 1. Recheck selected grind sizes and brew recipes 1. ตรวจสอบขนาดการบดที่เลือกและสูตรการชงอีกครั้ง
1300038 1. Recheck selected grind sizes and brew recipes 1. ตรวจสอบขนาดบดที่เลือกและสูตรการชงอีกครั้ง
1300039 Insert cup manually ใส่ถ้วยด้วยตนเอง
1300040 2. Select arm 2. เลือกแขน
1300041 3. Please insert cup into selected arm 3. กรุณาใส่ถ้วยลงในแขนที่เลือก

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

1
inter/tha/xml/multi/control_and_lang_swith.ev
View file

@ -27,6 +27,7 @@ Var InstanceTabOpenFile4 = InstanceTabOpenFile4 + "/page_catalog_group_milk.lxml
DEBUGVAR BoostEnergyPro
OpenRedirect "/taobin_project//xml/page_catalog_group_other.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/otherOther.ev"
OpenRedirect "/taobin_project//xml/page_catalog_group_other_other.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/otherOther.ev"
OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_other_other.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/otherOther.ev"
Var InstanceTabOpenFile7 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion

4
inter/tha/xml/multi/v3/event/event_v3/1_promotion_matcha_every_day.json
View file

@ -5,5 +5,5 @@
"type": "IMAGE",
"media_thai": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day2.png",
"media_eng": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day2.png",
"event_click": "Open \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_matcha_every_day.lxml\""
}
"event_click": "TabMenuVisibleInst 99\r\nOpenInst 2 \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_matcha_every_day.lxml\""
}

3
inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml
View file

@ -118,7 +118,8 @@
)
</Media>
<EventOnClick>
Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_matcha_every_day.lxml"
TabMenuVisibleInst 99
OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_matcha_every_day.lxml"
</EventOnClick>
</Banner>
<Banner>

4
ui/lang.tsv
View file

@ -1282,7 +1282,7 @@
1300016 Brew time:sec เวลาชง: วินาที
1300017 Test grind sizes ทดสอบขนาดบด
1300018 Coffee module type : ประเภทชุดกาแฟ :
1300019 1. Select grind sizes 1. เลือกขนาดการบด
1300019 1. Select grind sizes 1. เลือกขนาดบด
1300020 More coarse หยาบขึ้น
1300021 More fine ละเอียดขึ้น
1300022 2. Test grinding 2. ทดสอบการบด
@ -1301,7 +1301,7 @@
1300035 Recipes สูตรอาหาร
1300036 Save editing บันทึกการแก้ไข
1300037 Cancel edting ยกเลิกการแก้ไข
1300038 1. Recheck selected grind sizes and brew recipes 1. ตรวจสอบขนาดการบดที่เลือกและสูตรการชงอีกครั้ง
1300038 1. Recheck selected grind sizes and brew recipes 1. ตรวจสอบขนาดบดที่เลือกและสูตรการชงอีกครั้ง
1300039 Insert cup manually ใส่ถ้วยด้วยตนเอง
1300040 2. Select arm 2. เลือกแขน
1300041 3. Please insert cup into selected arm 3. กรุณาใส่ถ้วยลงในแขนที่เลือก

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

20
xml/page_board.xml
View file

@ -2113,14 +2113,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
@ -2129,6 +2122,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"

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

4
xml_main/startup.xml
View file

@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
Var XMLPageVersion = "9.90"
Var XMLPageVersionInt = 990
Var XMLPageVersion = "9.91"
Var XMLPageVersionInt = 991
Var CurrentMainVideo = 2
</EventOpen>

4
xml_main/startup_dev.xml
View file

@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
Var XMLPageVersion = "10.90"
Var XMLPageVersionInt = 1090
Var XMLPageVersion = "10.91"
Var XMLPageVersionInt = 1091
;Oreo
Var OreoGuarantee = 0