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

DO

Browse source
This commit is contained in:
kong 2023-02-21 11:34:32 +07:00
parent b87f9a53ce
commit ea6015ad27
28 changed files with 10593 additions and 9949 deletions
Download patch file Download diff file Expand all files Collapse all files

7
xml/menu_catalog_new.xml
View file

@ -179,8 +179,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
If PromotionOreoVolcanoEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

8
xml/menu_new_layout_gen.py
View file

@ -142,10 +142,10 @@
out_xml( '\t<Button>\r\n')
out_xml( '\t<State> $Sum' + str_con_var +' </State> \r\n')
if menu_img.startswith("VAR"):
out_xml( '\t<Filename> menu_img </Filename>\r\n')
out_xml( '\t<FilenamePress> menu_img </FilenamePress>\r\n')
out_xml( '\t<FilenameDisable> menu_img </FilenameDisable>\r\n')
if menu_img.startswith("#"):
out_xml( '\t<Filename> '+ menu_img[1:] + '_resting </Filename>\r\n')
out_xml( '\t<FilenamePress> '+ menu_img[1:] + '_press </FilenamePress>\r\n')
out_xml( '\t<FilenameDisable> '+ menu_img[1:] + '_disable </FilenameDisable>\r\n')
else:
out_xml( '\t<Filename> "' + new_default_dir + '/'+ menu_img +'" </Filename>\r\n')
out_xml( '\t<FilenamePress> "' + new_default_dir_press + '/'+ menu_img +'" </FilenamePress>\r\n')

91
xml/page_board.xml
View file

@ -664,9 +664,87 @@
EndIf
Var PromotionOreoVolcanoEnable = 0
If SystemDateMonthInt = 2 Then
If SystemDateDayInt = 21 Then
Var PromotionOreoVolcanoEnable = 1
EndIf
If SystemDateDayInt = 27 Then
Var PromotionOreoVolcanoEnable = 1
EndIf
EndIf
If SystemDateMonthInt = 3 Then
If SystemDateDayInt = 6 Then
Var PromotionOreoVolcanoEnable = 1
EndIf
If SystemDateDayInt = 13 Then
Var PromotionOreoVolcanoEnable = 1
EndIf
If SystemDateDayInt = 20 Then
Var PromotionOreoVolcanoEnable = 1
EndIf
If SystemDateDayInt = 27 Then
Var PromotionOreoVolcanoEnable = 1
EndIf
EndIf
Var PromotionOreoToppingFreeEnable = 0
If SystemDateMonthInt = 2 Then
If SystemDateDayInt = 21 Then
Var PromotionOreoToppingFreeEnable = 1
EndIf
If SystemDateDayInt = 22 Then
Var PromotionOreoToppingFreeEnable = 1
EndIf
EndIf
If SystemDateMonthInt = 3 Then
If SystemDateDayInt = 1 Then
Var PromotionOreoToppingFreeEnable = 1
EndIf
If SystemDateDayInt = 8 Then
Var PromotionOreoToppingFreeEnable = 1
EndIf
If SystemDateDayInt = 15 Then
Var PromotionOreoToppingFreeEnable = 1
EndIf
If SystemDateDayInt = 22 Then
Var PromotionOreoToppingFreeEnable = 1
EndIf
If SystemDateDayInt = 29 Then
Var PromotionOreoToppingFreeEnable = 1
EndIf
EndIf
DEBUGVAR $12-03-03-0009.Button
If $12-03-03-0009.Button = "Enable" Then
Else
Var PromotionOreoVolcanoEnable = 0
EndIf
Var PromotionIDCurrentOrder = 0
DEBUGVAR PromotionOreoToppingFreeEnable
DEBUGVAR PromotionOreoVolcanoEnable
RootLayoutVisible 3 "hide"
</EventOpen>
<EventUnitTest1>
Var PromotionOreoVolcanoEnable = 0
Var PromotionOreoToppingFreeEnable = 1
</EventUnitTest1>
<EventUnitTest2>
Var PromotionOreoVolcanoEnable = 1
Var PromotionOreoToppingFreeEnable = 0
</EventUnitTest2>
<Timeout> 1000 </Timeout>
@ -772,7 +850,18 @@
Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.xml"
If $12-03-03-0009.Button = "Enable" Then
Else
Var PromotionOreoVolcanoEnable = 0
EndIf
If PromotionOreoVolcanoEnable = 1 Then
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
Machine DoorClose

160
xml/page_brewing3.xml
View file

@ -305,6 +305,8 @@
; zone Language
If LanguageObjectShow = "Enable" Then
Var SelectMenuBetweenBrewEnable2 = SelectMenuBetweenBrewEnable1
Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var IMG_CNT = "ROOT/taobin_project/image/page_doing_inter/bg_show_time_remaining.png"
@ -314,6 +316,8 @@
EndIf
DEBUGVAR SelectMenuBetweenBrewEnable1
DEBUGVAR SelectMenuBetweenBrewEnable2
DEBUGVAR LanguageObjectShow
DEBUGVAR NoLangObjectShow
@ -346,7 +350,7 @@
Var GetLidButtonCountDown = 0
; language instance
RootLayoutVisible 3 "hide"
</EventOpen>
@ -1039,21 +1043,20 @@
EndIf
Else
Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
If SelectMenuBetweenBrewEnable2 = "Enable" Then
If SelectMenuBetweenBrewEnable1Blink = "Enable" Then
Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
Else
Var SelectMenuBetweenBrewEnable1Blink = "Enable"
EndIf
Else
Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
EndIf
EndIf
If SelectMenuBetweenBrewEnable2 = "Enable" Then
If SelectMenuBetweenBrewEnable1Blink = "Enable" Then
Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
Else
Var SelectMenuBetweenBrewEnable1Blink = "Enable"
EndIf
Else
Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
EndIf
DEBUGVAR CountUpBrewing
; animation video loop
If AnimationOn = "true" Then
@ -1187,6 +1190,7 @@
EndIf
EndIf
If RoadShow = "true" Then
Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
EndIf
@ -1229,6 +1233,7 @@
EndIf
Refresh
TimerReset
@ -1328,7 +1333,7 @@
;
; zone show time remaining
<Image>
<X> 751 </X>
<Y> 413 </Y>
@ -1354,7 +1359,6 @@
<ID> 000405 </ID>
</Language>
</Text>
<Text>
<X> 941 </X>
<Y> 518 </Y>
@ -1389,6 +1393,33 @@
EndIf
</EventClick>
</Button>
<Button>
<X> 733 </X>
<Y> 1787 </Y>
<State>SelectMenuBetweenBrewEnable2</State>
<Filename> "ROOT/taobin_project/image/page_doing_inter/bn_next_order.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_doing_inter/bp_next_order.png" </FilenamePress>
<EventClick>
If MachineState_Result = 0 Then
SAVELOG "User click next button"
Var Seeker = "next"
Var MultiPayEnable = "false"
CoinPause
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
</EventClick>
<Language>
<X> 0 </X>
<Y> 20 </Y>
<Width> 297 </Width>
<Height> 96 </Height>
<ID> 000407 </ID>
</Language>
</Button>
<Button>
@ -1470,105 +1501,6 @@
; straw left
;<Button>
;<X> 50 </X>
;<Y> 572 </Y>
;<State> StrawStateX </State>
;<Mode> "No" </Mode>
;<Filename> "ROOT/taobin_project/image/topping2/bn_straw.png" </Filename>
;<FilenamePress> "ROOT/taobin_project/image/topping2/bp_straw.png" </FilenamePress>
;<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_straw.png" </FilenameDisable>
;<EventClick>
; SAVELOG "Click straw cb"
; If StrawStateX = "Press" Then
; ;Var StrawStateX = "Enable"
; Else
; Var StrawStateX = "Press"
; Var Seeker.strawAction = 1
;
; EndIf
; Refresh
;</EventClick>
;</Button>
;
;<Button>
;<X> 377 </X>
;<Y> 579 </Y>
;<State> StrawStateX </State>
;<Mode> "No" </Mode>
;<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
;<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
;<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
;<EventClick>
; SAVELOG "Click straw cb"
; If StrawStateX = "Press" Then
; ;Var StrawStateX = "Enable"
; Else
; Var StrawStateX = "Press"
; Var Seeker.strawAction = 1
; EndIf
; Refresh
;</EventClick>
;</Button>
;; LID left
;<Button>
;<X> 50 </X>
;<Y> 648 </Y>
;<State> LidStateX </State>
;<Mode> "No" </Mode>
;<Filename> "ROOT/taobin_project/image/topping2/bn_lid.png" </Filename>
;<FilenamePress> "ROOT/taobin_project/image/topping2/bp_lid.png" </FilenamePress>
;<FilenameDisable> Var( DirImage + "/bd_lid.png" ) </FilenameDisable>
;<EventClick>
;
; If Seeker.thankLidFlag = 0 Then
;
; SAVELOG "Click LID pic"
; If LidStateX = "Press" Then
; ;Var LidStateX = "Enable"
; Else
; Var LidStateX = "Press"
; Var Seeker.lidAction = 1
; EndIf
;
;
; DEBUGVAR SugarState1
; Refresh
;
; EndIf
;
;</EventClick>
;</Button>
;
;<Button>
;<X> 377 </X>
;<Y> 655 </Y>
;<State> LidStateX </State>
;<Mode> "No" </Mode>
;<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
;<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
;<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
;<EventClick>
;
; If Seeker.thankLidFlag = 0 Then
;
; SAVELOG "Click LID cb"
; If LidStateX = "Press" Then
; ;Var LidStateX = "Enable"
; Else
; Var LidStateX = "Press"
; Var Seeker.lidAction = 1
; EndIf
; Refresh
;
; EndIf
;
;</EventClick>
;</Button>
</Popup>

2
xml/page_catalog.lxml
View file

@ -248,6 +248,8 @@
DEBUGVAR Array2TestInt[2][0]
DEBUGVAR Array2TestInt[3][0]
Var PromotionIDCurrentOrder = 0
RootLayoutVisible 3 "show"
</EventOpen>
<Timeout> 1000 </Timeout>

24
xml/page_catalog.xml
View file

@ -6,6 +6,21 @@
<Volume> SoundVolume </Volume>
<EventOpen>
If $12-03-03-0009.Button = "Enable" Then
Var smoothie_oreo_resting = "ROOT/taobin_project/image/page_drink_n//bn_oreo_vo_get1.png"
Var smoothie_oreo_press = "ROOT/taobin_project/image/page_drink_press_n//bn_oreo_vo_get1.png"
Var smoothie_oreo_disable = "ROOT/taobin_project/image/page_drink_disable_n2//bn_oreo_vo_get1.png"
Else
Var PromotionOreoVolcanoEnable = 0
Var smoothie_oreo_resting = "ROOT/taobin_project/image/page_drink_n//bn_smoothie_oreo.png"
Var smoothie_oreo_press = "ROOT/taobin_project/image/page_drink_press_n//bn_smoothie_oreo.png"
Var smoothie_oreo_disable = "ROOT/taobin_project/image/page_drink_disable_n2//bn_smoothie_oreo.png"
EndIf
Var PromotionIDCurrentOrder = 0
If SpiralOnline = "true" Then
If Seeker = "next" Then
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml"
@ -204,6 +219,7 @@
If BoxID = 0 Then
RebootWithCause "BoxID was zero"
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
@ -333,11 +349,11 @@
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
; eng
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
If PromotionOreoVolcanoEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml"
EndIf
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

12
xml/page_catalog2.xml
View file

@ -191,6 +191,11 @@
RebootWithCause "BoxID was zero"
EndIf
If $12-03-03-0009.Button = "Enable" Then
Else
Var PromotionOreoVolcanoEnable = 0
EndIf
</EventOpen>
<EventLanguageChange>
;
@ -332,8 +337,11 @@
<EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
If PromotionOreoVolcanoEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

7
xml/page_catalog_group_appfast.xml
View file

@ -326,8 +326,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
If PromotionOreoVolcanoEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

7
xml/page_catalog_group_cocktail.xml
View file

@ -318,8 +318,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
If PromotionOreoVolcanoEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

7
xml/page_catalog_group_coffee.xml
View file

@ -318,8 +318,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
If PromotionOreoVolcanoEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

7
xml/page_catalog_group_forkid.xml
View file

@ -327,8 +327,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
If PromotionOreoVolcanoEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

7
xml/page_catalog_group_health.xml
View file

@ -318,8 +318,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
If PromotionOreoVolcanoEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

15
xml/page_catalog_group_milk.xml
View file

@ -316,8 +316,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
If PromotionOreoVolcanoEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>
@ -2539,9 +2542,9 @@ SMOOTHIE" </Value>
<State> Flag( 12-03-03-0009.Button,$Sum1203030009) </State>
<Button>
<State> $Sum1203030009 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_smoothie_oreo.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_smoothie_oreo.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_smoothie_oreo.png" </FilenameDisable>
<Filename> smoothie_oreo_resting </Filename>
<FilenamePress> smoothie_oreo_press </FilenamePress>
<FilenameDisable> smoothie_oreo_disable </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
@ -2549,7 +2552,7 @@ SMOOTHIE" </Value>
Var NameDrinkTH = "โอริโอ้ปั่นภูเขาไฟ"
Var DrinkDescriptionTH = "นม น้ำตาล โอริโอ้ "
Var DrinkDescription = "Milk, Sugar, Oreo, Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_oreo.png"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "#smoothie_oreo"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $-.Price

7
xml/page_catalog_group_other.xml
View file

@ -317,8 +317,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
If PromotionOreoVolcanoEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

7
xml/page_catalog_group_recommend.xml
View file

@ -324,8 +324,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
If PromotionOreoVolcanoEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

20126
xml/page_catalog_group_recommend2.xml
View file

File diff suppressed because it is too large Load diff

7
xml/page_catalog_group_tea.xml
View file

@ -318,8 +318,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
If PromotionOreoVolcanoEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

7
xml/page_catalog_group_whey.xml
View file

@ -323,8 +323,11 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
If PromotionOreoVolcanoEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
EndIf
</EventClick>
</Button>

30
xml/page_topping_select6.xml
View file

@ -291,6 +291,14 @@
Var bg_lidProblem_ST = "Invisible"
Var GetLidButtonState = "Invisible"
Var PromotionIDCurrentOrder = 0
If PromotionOreoVolcanoEnable = 1 Then
If PD_CODE3 = "12-03-03-0009" Then
Var PromotionIDCurrentOrder = 2
EndIf
EndIf
DEBUGVAR PromotionIDCurrentOrder
</EventOpen>
<Timeout> 1000 </Timeout>
@ -423,7 +431,15 @@
EndIf
EndIf
If PromotionOreoToppingFreeEnable = 1 Then
Var toppingID6price2 = 0
If show_eng = "true" Then
Var text_price_6 = "(Free)"
Else
Var text_price_6 = "(ฟรี)"
EndIf
EndIf
Function 2
@ -548,6 +564,17 @@
Var text_price_6 = ""
EndIf
If PromotionOreoToppingFreeEnable = 1 Then
Var toppingID6price2 = 0
If show_eng = "true" Then
Var text_price_6 = "(Free)"
Else
Var text_price_6 = "(ฟรี)"
EndIf
EndIf
If blend_button_state = "PressForever" Then
Var showOreoAddEnable = "Enable"
@ -558,6 +585,7 @@
EndIf
Var ExtraTopping = "Enable"
@ -1535,6 +1563,7 @@
</EventClick>
</Button>
@ -3779,6 +3808,7 @@
Var PriceDrinkNoTop = PriceD3
Function 2