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

fix HEAD

Browse source
This commit is contained in:
wanlop run 2024-12-12 10:51:27 +07:00
parent 410f802f51
commit 5f6b94ccf6
15 changed files with 14 additions and 275 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1091,7 +1091,7 @@
1300016 Brew time:sec เวลาชง: วินาที 1300016 Brew time:sec เวลาชง: วินาที
1300017 Test grind sizes ทดสอบขนาดบด 1300017 Test grind sizes ทดสอบขนาดบด
1300018 Coffee module type : ประเภทชุดกาแฟ : 1300018 Coffee module type : ประเภทชุดกาแฟ :
1300019 1. Select grind sizes 1. เลือกขนาดการบด 1300019 1. Select grind sizes 1. เลือกขนาดบด
1300020 More coarse หยาบขึ้น 1300020 More coarse หยาบขึ้น
1300021 More fine ละเอียดขึ้น 1300021 More fine ละเอียดขึ้น
1300022 2. Test grinding 2. ทดสอบการบด 1300022 2. Test grinding 2. ทดสอบการบด

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

2
inter/tha/xml/multi/page_catalog_group_forkid.lxml
View file

@ -106,7 +106,7 @@
Var SaveStringInst = "ShowThai" Var SaveStringInst = "ShowThai"
Var show_eng = "true" Var show_eng = "true"
EndIf EndIf
If LanguageShow "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var show_eng = "false" Var show_eng = "false"
Var SaveStringInst = "ShowMYANMAR" Var SaveStringInst = "ShowMYANMAR"
EndIf EndIf

2
inter/tha/xml/multi/page_catalog_group_forkid.skt
View file

@ -109,7 +109,7 @@
Var SaveStringInst = "ShowThai" Var SaveStringInst = "ShowThai"
Var show_eng = "true" Var show_eng = "true"
EndIf EndIf
If LanguageShow "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var show_eng = "false" Var show_eng = "false"
Var SaveStringInst = "ShowMYANMAR" Var SaveStringInst = "ShowMYANMAR"
EndIf EndIf

57
inter/tha/xml/multi/page_catalog_group_milk.lxml
View file

@ -184,63 +184,6 @@
TimerReset TimerReset
</EventTimeout> </EventTimeout>
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR SaveStringInst
DEBUGVAR show_eng
Var ButtonLanguageCurrentXPosition = 1005
Var ButtonLanguageCurrentYPosition = 458 - 38
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 450 - 38
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
EndIf
DEBUGVAR LanguageShow
If SaveStringInst = "ShowThai" Then
If LanguageShow = "THAI" Then
Else
Var show_eng = "true"
InstanceSetString "ShowMYANMAR"
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
EndIf
EndIf
If SaveStringInst = "ShowMYANMAR" Then
If LanguageShow = "MYANMAR" Then
Else
Var show_eng = "false"
InstanceSetString "ShowEng"
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
EndIf
EndIf
If SaveStringInst = "ShowEng" Then
If LanguageShow = "ENG" Then
Else
Var show_eng = "false"
InstanceSetString "ShowThai"
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
EndIf
EndIf
</EventOnShow>
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml" ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml"

57
inter/tha/xml/multi/page_catalog_group_milk.skt
View file

@ -186,63 +186,6 @@
TimerReset TimerReset
</EventTimeout> </EventTimeout>
<EventOnShow>
InstanceGetString SaveStringInst
DEBUGVAR SaveStringInst
DEBUGVAR show_eng
Var ButtonLanguageCurrentXPosition = 1005
Var ButtonLanguageCurrentYPosition = 458 - 38
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 450 - 38
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
EndIf
DEBUGVAR LanguageShow
If SaveStringInst = "ShowThai" Then
If LanguageShow = "THAI" Then
Else
Var show_eng = "true"
InstanceSetString "ShowMYANMAR"
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
EndIf
EndIf
If SaveStringInst = "ShowMYANMAR" Then
If LanguageShow = "MYANMAR" Then
Else
Var show_eng = "false"
InstanceSetString "ShowEng"
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
EndIf
EndIf
If SaveStringInst = "ShowEng" Then
If LanguageShow = "ENG" Then
Else
Var show_eng = "false"
InstanceSetString "ShowThai"
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
EndIf
EndIf
</EventOnShow>
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml" ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml"

2
inter/tha/xml/multi/page_catalog_group_other.lxml
View file

@ -113,7 +113,7 @@
Var SaveStringInst = "ShowThai" Var SaveStringInst = "ShowThai"
Var show_eng = "true" Var show_eng = "true"
EndIf EndIf
If LanguageShow "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var show_eng = "false" Var show_eng = "false"
Var SaveStringInst = "ShowMYANMAR" Var SaveStringInst = "ShowMYANMAR"
EndIf EndIf

2
inter/tha/xml/multi/page_catalog_group_other.skt
View file

@ -116,7 +116,7 @@
Var SaveStringInst = "ShowThai" Var SaveStringInst = "ShowThai"
Var show_eng = "true" Var show_eng = "true"
EndIf EndIf
If LanguageShow "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var show_eng = "false" Var show_eng = "false"
Var SaveStringInst = "ShowMYANMAR" Var SaveStringInst = "ShowMYANMAR"
EndIf EndIf

2
inter/tha/xml/multi/page_catalog_group_tea.lxml
View file

@ -107,7 +107,7 @@
Var SaveStringInst = "ShowThai" Var SaveStringInst = "ShowThai"
Var show_eng = "true" Var show_eng = "true"
EndIf EndIf
If LanguageShow "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var show_eng = "false" Var show_eng = "false"
Var SaveStringInst = "ShowMYANMAR" Var SaveStringInst = "ShowMYANMAR"
EndIf EndIf

2
inter/tha/xml/multi/page_catalog_group_tea.skt
View file

@ -110,7 +110,7 @@
Var SaveStringInst = "ShowThai" Var SaveStringInst = "ShowThai"
Var show_eng = "true" Var show_eng = "true"
EndIf EndIf
If LanguageShow "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var show_eng = "false" Var show_eng = "false"
Var SaveStringInst = "ShowMYANMAR" Var SaveStringInst = "ShowMYANMAR"
EndIf EndIf

2
inter/tha/xml/multi/page_catalog_group_whey.lxml
View file

@ -121,7 +121,7 @@
Var SaveStringInst = "ShowThai" Var SaveStringInst = "ShowThai"
Var show_eng = "true" Var show_eng = "true"
EndIf EndIf
If LanguageShow "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var show_eng = "false" Var show_eng = "false"
Var SaveStringInst = "ShowMYANMAR" Var SaveStringInst = "ShowMYANMAR"
EndIf EndIf

2
inter/tha/xml/multi/page_catalog_group_whey.skt
View file

@ -124,7 +124,7 @@
Var SaveStringInst = "ShowThai" Var SaveStringInst = "ShowThai"
Var show_eng = "true" Var show_eng = "true"
EndIf EndIf
If LanguageShow "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var show_eng = "false" Var show_eng = "false"
Var SaveStringInst = "ShowMYANMAR" Var SaveStringInst = "ShowMYANMAR"
EndIf EndIf

3
inter/tha/xml/multi/tab_menu_show_and_refresh.lxml
View file

@ -1,3 +1,2 @@
OpenInst 13 "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml" OpenInst 13 "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
Refresh

136
inter/tha/xml/page_topping_select6.lxml
View file

@ -883,7 +883,6 @@
<Color> "0xeae6e1" </Color> <Color> "0xeae6e1" </Color>
</Image> </Image>
<<<<<<< HEAD
<EventLanguageOnChange> <EventLanguageOnChange>
DEBUGVAR LanguageShowByIndex DEBUGVAR LanguageShowByIndex
@ -1018,8 +1017,6 @@
</EventLanguageOnChange> </EventLanguageOnChange>
=======
>>>>>>> 0513de0cc4536e83554493ea2ad713e100ac8daa
<Button> <Button>
<X> 990 </X> <X> 990 </X>
<Y> 438 </Y> <Y> 438 </Y>
@ -1189,139 +1186,6 @@
</EventClick> </EventClick>
</LangSwitch> </LangSwitch>
<EventLanguageOnChange>
DEBUGVAR LanguageShowByIndex
DEBUGVAR LanguageShow
If LanguageShow = "ENG" Then
Var topping_shot_price_x = 630
Var text_x_add_oreo_price = 430
Var text_show_normal_x = 408
Var text_show_blend_x = 892
Var SugarZeroCalPrice_X = 540
Var text_cancel_xc = 53
Var text_cancel_yc = 16
Var Text_SugarZeroCalPrice_X = 360
Var Text_SugarNormalPrice_Y = 80
Var OatMilkPrice_X = 260
If show_name_len > 24 Then
Var showname = showname + "###size=54"
EndIf
If BGSugar = "Enable" Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
EndIf
If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
Var ShowTextSelfTestCountDown = "Please wait a moment (" + MACHINE_SELF_TEST_COUNT_DOWN
Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
Else
Var ShowTextSelfTestCountDown = "Please wait a moment"
EndIf
EndIf
If LanguageShow = "THAI" Then
Var topping_shot_price_x = 600
Var text_x_add_oreo_price = 420
Var text_show_normal_x = 386
Var text_show_blend_x = 852
Var SugarZeroCalPrice_X = 495
Var text_cancel_xc = 53
Var text_cancel_yc = 16
Var Text_SugarZeroCalPrice_X = 360
Var Text_SugarNormalPrice_Y = 75
Var OatMilkPrice_X = 220
If show_name_len > 0 Then
Var showname = showname + "###size=68"
EndIf
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
Var ShowTextSelfTestCountDown ="กรุณารอสักครู่ (" + MACHINE_SELF_TEST_COUNT_DOWN
Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
Else
Var ShowTextSelfTestCountDown ="กรุณารอสักครู่"
EndIf
EndIf
If LanguageShow = "MYANMAR" Then
Var show_eng = "true"
DEBUGVAR show_eng
Var topping_shot_price_x = 630
Var text_x_add_oreo_price = 430
Var text_show_normal_x = 568
Var text_show_blend_x = 903
Var SugarZeroCalPrice_X = 540
Var Text_SugarZeroCalPrice_X = 360
Var Text_SugarNormalPrice_Y = 80
Var text_cancel_xc = 5
Var text_cancel_yc = 30
Var show_eng = "true"
Var OatMilkPrice_X = 210
If show_name_len > 24 Then
Var showname = showname + "###size=54"
EndIf
Var DirImage = "ROOT/taobin_project/image/topping_mmr"
If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
Var ShowTextSelfTestCountDown = "ခဏစောင့်ပါ။ (" + MACHINE_SELF_TEST_COUNT_DOWN
Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
Else
Var ShowTextSelfTestCountDown = "ခဏစောင့်ပါ။"
EndIf
EndIf
;Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000113, LanguageShowByIndex)
;DEBUGVAR StringToppingOatMilkWithPrice
;Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
;DEBUGVAR StringToppingOatMilkWithPrice
Var StringToppingOreoWithPrice !assigned GetLanguageID( 000101, LanguageShowByIndex)
Var StringToppingOreoWithPrice = StringToppingOreoWithPrice + text_price_6
;Var StringToppingShotWithPrice !assigned GetLanguageID( 000100, LanguageShowByIndex)
;Var StringToppingShotWithPrice = StringToppingShotWithPrice + text_price_topping
Var StringCoffeeLevelWithPrice0 !assigned GetLanguageID( 000108, LanguageShowByIndex)
Var StringCoffeeLevelWithPrice0 = StringCoffeeLevelWithPrice0 + CustomCoffeeLevelAdditionalPrice[0]
Var StringCoffeeLevelWithPrice1 !assigned GetLanguageID( 000109, LanguageShowByIndex)
Var StringCoffeeLevelWithPrice1 = StringCoffeeLevelWithPrice1 + CustomCoffeeLevelAdditionalPrice[1]
Var StringCoffeeLevelWithPrice2 !assigned GetLanguageID( 000110, LanguageShowByIndex)
Var StringCoffeeLevelWithPrice2 = StringCoffeeLevelWithPrice2 + CustomCoffeeLevelAdditionalPrice[2]
Var StringCoffeeLevelWithPrice3 !assigned GetLanguageID( 000111, LanguageShowByIndex)
Var StringCoffeeLevelWithPrice3 = StringCoffeeLevelWithPrice3 + CustomCoffeeLevelAdditionalPrice[3]
;Var showname = aliasName[LanguageShowByIndex]
;Var showdesc = aliasName[LanguageShowByIndex]
If SelectDrinkType = 1 Then
Var showname = NameLang[IndexDrinktType][LanguageShowByIndex]
Var showdesc = DescLang[IndexDrinktType][LanguageShowByIndex]
Else
Var showname = aliasName[LanguageShowByIndex]
Var showdesc = aliasName[LanguageShowByIndex]
EndIf
DEBUGVAR showname
DEBUGVAR showdesc
DEBUGVAR IndexDrinktType
BackslashNToEnter showname
BackslashNToEnter showdesc
CRLFToSpace showname
CRLFToSpace showdesc
Var Timeout = 0
Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 438
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 430
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
RefreshAll
</EventLanguageOnChange>
; back ; back
<Button> <Button>
<X> 19 </X> <X> 19 </X>

5
xml/page_catalog_group_pro_oreo_11_fixed.xml
View file

@ -3401,13 +3401,8 @@ Sugar, Oreo" </Value>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventOnClick> <EventOnClick>
Var NameDrink = "GINGER MILK TEA OREO SMOOTHIE" Var NameDrink = "GINGER MILK TEA OREO SMOOTHIE"
<<<<<<< HEAD
Var NameDrinkTH = "ชานมขิงโอริโอ้ปั่น" Var NameDrinkTH = "ชานมขิงโอริโอ้ปั่น"
Var DrinkDescriptionTH = "ขิง นม น้ำตาล Oreo" Var DrinkDescriptionTH = "ขิง นม น้ำตาล Oreo"
=======
Var NameDrinkTH = "ชานมขิงโอรีโอปั่น"
Var DrinkDescriptionTH = "ขิง นม น้ำตาล โอรีโอ"
>>>>>>> 60d7978f96f90bf627023963827e19d9b7d9a52a
Var DrinkDescription = "Ginger, Milk, Sugar, Oreo" Var DrinkDescription = "Ginger, Milk, Sugar, Oreo"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ginger_milk_Oreo_smoothie_oreo_11" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ginger_milk_Oreo_smoothie_oreo_11"
Var PictureDrink = PictureDrink + Extension Var PictureDrink = PictureDrink + Extension

13
xml/page_thankyouConti.xml
View file

@ -59,11 +59,11 @@
;DEBUGVAR LidState ;DEBUGVAR LidState
DEBUGVAR BottomText DEBUGVAR BottomText
;If StarwState = "Press" Then ;I f StarwState = "Press" Then
; Machine StrawWithDelay ; Machine StrawWithDelay
; LED LedDoorLid Blink 255 255 255 255 ; LED LedDoorLid Blink 255 255 255 255
;EndIf ;EndIf
;If LidState = "Press" Then ;I f LidState = "Press" Then
; Machine LidWithDelay ; Machine LidWithDelay
; LED LedDoorLid Blink 255 255 255 255 ; LED LedDoorLid Blink 255 255 255 255
;EndIf ;EndIf
@ -293,25 +293,20 @@
Else Else
Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ" Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
EndIf EndIf
<<<<<<< HEAD
Else
=======
If LanguageShow = "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။" Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
EndIf EndIf
Else Else
>>>>>>> 3637980ada4fd59458b0d1e714c0a7b556fbf717
If CupChecking = "true" Then If CupChecking = "true" Then
If show_eng = "true" Then If show_eng = "true" Then
Var MachineErrorDetailAll = " Please take a cup." Var MachineErrorDetailAll = " Please take a cup."
Else Else
Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ" Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
<<<<<<< HEAD
=======
EndIf EndIf
If LanguageShow = "MYANMAR" Then If LanguageShow = "MYANMAR" Then
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။" Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
>>>>>>> 3637980ada4fd59458b0d1e714c0a7b556fbf717
EndIf EndIf
Else Else
If show_eng = "true" Then If show_eng = "true" Then