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:
Pakin 2024-05-07 14:42:35 +07:00
commit 154c438f76
110 changed files with 8669 additions and 37395 deletions
Download patch file Download diff file Expand all files Collapse all files

146
xml/event/promotion_energy_drink_1_bath.xml
View file

@ -12665,23 +12665,14 @@ LIMENADE SODA" </Value>
</Image>
<Text>
<X> 50 </X>
<<<<<<< HEAD
<Y> 265 </Y>
<Size> 14 </Size>
=======
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State>
<<<<<<< HEAD
<Value> Var( "฿" + $-.Price ) </Value>
=======
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
</Text>
<Image>
<X> 81 </X>
@ -12692,23 +12683,14 @@ LIMENADE SODA" </Value>
</Image>
<Text>
<X> 115 </X>
<<<<<<< HEAD
<Y> 265 </Y>
<Size> 14 </Size>
=======
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State>
<<<<<<< HEAD
<Value> Var( "฿" + $.Price ) </Value>
=======
<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
</Text>
<Image>
<X> 146 </X>
@ -12718,7 +12700,6 @@ LIMENADE SODA" </Value>
<State> $12-05-03-0092.Button </State>
</Image>
<Text>
<<<<<<< HEAD
<X> 183 </X>
<Y> 264 </Y>
<Size> 14 </Size>
@ -12728,17 +12709,6 @@ LIMENADE SODA" </Value>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $12-05-03-0092.Button </State>
<Value> Var( "฿" + $12-05-03-0092.Price ) </Value>
=======
<X> 180 </X>
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
<Width>220</Width>
<Font> KanitRegularTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $12-05-03-0092.Button </State>
<Value> StringFmt( $12-05-03-0092.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
</Text>
<Image>
<X> 81 </X>
@ -12948,23 +12918,14 @@ Water" </Value>
</Image>
<Text>
<X> 50 </X>
<<<<<<< HEAD
<Y> 265 </Y>
<Size> 14 </Size>
=======
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State>
<<<<<<< HEAD
<Value> Var( "฿" + $-.Price ) </Value>
=======
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
</Text>
<Image>
<X> 81 </X>
@ -12975,23 +12936,14 @@ Water" </Value>
</Image>
<Text>
<X> 115 </X>
<<<<<<< HEAD
<Y> 265 </Y>
<Size> 14 </Size>
=======
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
<Width>220</Width>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $12-03-02-0058.Button </State>
<<<<<<< HEAD
<Value> Var( "฿" + $12-03-02-0058.Price ) </Value>
=======
<Value> StringFmt( $12-03-02-0058.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
</Text>
<Image>
<X> 146 </X>
@ -13001,7 +12953,6 @@ Water" </Value>
<State> $12-03-03-0058.Button </State>
</Image>
<Text>
<<<<<<< HEAD
<X> 183 </X>
<Y> 264 </Y>
<Size> 14 </Size>
@ -13011,17 +12962,6 @@ Water" </Value>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $12-03-03-0058.Button </State>
<Value> Var( "฿" + $12-03-03-0058.Price ) </Value>
=======
<X> 180 </X>
<Y> TextPriceMenuY </Y>
<Size> TextPriceMenuSize </Size>
<Width>220</Width>
<Font> KanitRegularTTF </Font>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> $12-03-03-0058.Button </State>
<Value> StringFmt( $12-03-03-0058.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
>>>>>>> 66a34af8e1ecebd3e9b18141f9cf61b3628765c5
</Text>
<Image>
<X> 81 </X>
@ -13112,92 +13052,6 @@ Water" </Value>
<Button>
<X> 42 </X>
<Y> 518 </Y>
<State> BigButtonEnable </State>
<Filename>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_EN.png"
Else
Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_TH.png"
EndIf
)
</Filename>
<FilenamePress>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_EN.png"
Else
Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_TH.png"
EndIf
)
</FilenamePress>
<FilenameDisable>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_EN.png"
Else
Var return = "ROOT/taobin_project/image/event/energy_drink_1_bath/1_baht_energy_TH.png"
EndIf
)
</FilenameDisable>
<EventOnClick>
Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_catalog.xml"
</EventOnClick>
<Video>
<X> 42 </X>
<Y> 518 </Y>
<Width> 484 </Width>
<Height> 616 </Height>
<Loop> "true" </Loop>
<State>
eval(
If show_eng = "true" Then
Var return = "Invisible"
Else
Var return = "Enable"
EndIf
)
</State>
<Filename> "ROOT/taobin_project/image/event/energy_drink_1_bath/energy_drink_1_bath_th.mp4" </Filename>
</Video>
<Video>
<X> 42 </X>
<Y> 518 </Y>
<Width> 484 </Width>
<Height> 616 </Height>
<State>
eval(
If show_eng = "true" Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
)
</State>
<Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/image/event/energy_drink_1_bath/energy_drink_1_bath_en.mp4" </Filename>
</Video>
</Button>
<EventUnitTest1>
Var BigButtonEnable = "Enable"
Refresh
</EventUnitTest1>
<EventUnitTest2>
Var BigButtonEnable = "Invisible"
Refresh
</EventUnitTest2>
<Button>
<X> 780 </X>

16082
xml/menutab/page_catalog_group_other.xml
View file

File diff suppressed because it is too large Load diff

2
xml/menutab/page_catalog_group_whey.xml
View file

@ -578,7 +578,7 @@
Var block_index_override = 0
Var block_index_move = 0
</Script>
; menu_new_list 16
; menu_new_list 17
; ==================> Len = 17
; - 12-04-02-0001 -
<Block>

6
xml/page_back_to_error.xml
View file

@ -8,7 +8,11 @@
Var CheckCupStateDoorCupClose = ""
If InternationalEnable = 1 Then
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.lxml"
If CountryName = "Australia" Then
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/page_show_error.lxml"
Else
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.lxml"
EndIf
Else
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_show_error.xml"
EndIf

84
xml/page_board.xml
View file

@ -438,7 +438,10 @@
StrLen AdvertiseProfile AdvertiseProfileLen
If XMLProfile = "taobin_notopup" Then
STRCONTAIN "taobin_notopup" XMLProfile taobin_notopup
DEBUGVAR taobin_notopup
If taobin_notopup = "true" Then
Var ButtontoTopupMenu = "Disable"
Else
Var ButtontoTopupMenu = "Enable"
@ -972,40 +975,23 @@
If NoWaitMachineEnable = 1 Then
If stop_now = "true" Then
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev"
EndIf
Else
If MachineStage = "close-maintenance" Then
If InternationalEnable = 1 Then
RootLayoutVisible 3 "hide"
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev"
EndIf
EndIf
If MachineStage = "mcu-upgrade" Then
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev"
EndIf
If NeedUpgrade = "true" Then
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev"
EndIf
If RoadShow = "true" Then
@ -1101,37 +1087,21 @@
If NoWaitMachineEnable = 1 Then
If RecoveryRunning = "true" Then
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev"
EndIf
If stop_now = "true" Then
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev"
EndIf
Else
If MachineStage = "close-maintenance" Then
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev"
EndIf
EndIf
If MachineStage = "mcu-upgrade" Then
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev"
EndIf
@ -1141,11 +1111,7 @@
Var stop_now = "true"
Var MachineErrorDetailAll = "???"
SAVELOG "NETCORE_LOST_CNT"
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev"
EndIf
@ -1172,11 +1138,7 @@
Var MachineErrorDetailAll = "Netcore Lost"
SAVELOG "Netcore Lost NCIC07_EVENT_CNT"
DEBUGVAR NCIC07_EVENT_CNT
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev"
EndIf
Else
@ -1189,11 +1151,7 @@
EndIf
If MachineStage = "drink-failed" Then
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev"
EndIf
@ -1215,11 +1173,7 @@
Var stop_now = "true"
Var stop_now_from_door_cup = 1
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev"
EndIf
Else
If DoorCupPosition = "Bottom" Then
@ -1233,11 +1187,7 @@
If NeedUpgrade = "true" Then
If InternationalEnable = 1 Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
TRY "ROOT/taobin_project/xml/sometime/script_open_page_show_error.ev"
EndIf
If CountDownShowButton > 0 Then

4
xml/page_catalog.xml
View file

@ -177,9 +177,9 @@
EndIf
If XMLProfile = "taobin_notopup" Then
If taobin_notopup = "true" Then
Var ButtontoTopupMenu = "Disable"
EndIf

15932
xml/page_catalog_group_other.xml
View file

File diff suppressed because it is too large Load diff

2
xml/page_catalog_group_whey.xml
View file

@ -549,7 +549,7 @@
Var block_index_override = 0
Var block_index_move = 0
</Script>
; menu_new_list 16
; menu_new_list 17
; ==================> Len = 17
; - 12-04-02-0001 -
<Block>

3
xml/profile/run.ev
View file

@ -34,7 +34,8 @@
STRCONTAIN "AllPriceUp05" XMLProfile AllPriceUp05
STRCONTAIN "AllPriceUp10" XMLProfile AllPriceUp10
DEBUGVAR EnableLiveness
DEBUGVAR Only18
DEBUGVAR NoSugarStepRight2

13
xml/sometime/script_open_page_show_error.ev Normal file
View file

@ -0,0 +1,13 @@
If InternationalEnable = 1 Then
If MachineStage = "close-maintenance" Then
RootLayoutVisible 3 "hide"
EndIf
If CountryName = "Australia" Then
Open "ROOT/taobin_project/inter/aus/xml/page_show_error.lxml"
Else
Open "ROOT/taobin_project/xml/page_show_error.lxml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf