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

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

Browse source
This commit is contained in:
pichet 2023-03-13 13:13:52 +07:00
commit 23bb4e4857
14 changed files with 186 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/page3/bn_oreo_vo_get1_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 57 KiB

BIN
image/page3/bp_oreo_vo_get1_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 58 KiB

BIN
image/page3/img_oreo_wed_free.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
image/page3/img_oreo_wed_topping.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
image/topping2/bg_top_oreo2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Before After
Before After

BIN
image/topping2_en/bg_top_oreo2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Before After
Before After

BIN
video/main_page_en.mp4 Normal file
View file

Binary file not shown.

20
xml/page_board.xml
View file

@ -208,7 +208,14 @@
Var EventTurnOn = 0
Var CountDownShowButton = 35
Var ShowButtonClickFull = "Invisible"
If LanguageInit = "ENG" Then
Var VideoMainPage = "ROOT/taobin_project/video/main_page_en.mp4"
Var show_eng = "true"
Else
Var VideoMainPage = "ROOT/taobin_project/video/main_page.mp4"
Var show_eng = "false"
EndIf
DEBUGVAR SystemDateMonthInt
DEBUGVAR SystemDateDayInt
@ -532,11 +539,6 @@
Var WebAppShow = "Invisible"
EndIf
;READ_FILE "/mnt/sdcard/spiral" SpiralOnline
;READ_FILE "/mnt/sdcard/new_layout" new_layout
DEBUGVAR XMLPageVersionInt
; forever
@ -670,6 +672,9 @@
If SystemDateDayInt = 20 Then
Var PromotionOreoVolcanoEnable = 1
EndIf
If SystemDateDayInt = 24 Then
Var PromotionOreoVolcanoEnable = 1
EndIf
If SystemDateDayInt = 27 Then
Var PromotionOreoVolcanoEnable = 1
@ -697,7 +702,7 @@
If SystemDateDayInt = 21 Then
Var PromotionOreoToppingFreeEnable = 1
EndIf
If SystemDateDayInt = 22 Then
If SystemDateDayInt = 24 Then
Var PromotionOreoToppingFreeEnable = 1
EndIf
EndIf
@ -743,6 +748,7 @@
DEBUGVAR PromotionOreoToppingFreeEnable
DEBUGVAR PromotionOreoVolcanoEnable
RootLayoutVisible 3 "hide"
</EventOpen>
@ -990,7 +996,7 @@
;<Loop>"true"</Loop>
;<Volume> 80 </Volume>
<Filename> VideoMainPage </Filename>
<FilenameAlternate> "ROOT/taobin_project/video/main_page.mp4" </FilenameAlternate>
<FilenameAlternate> "ROOT/taobin_project/video/main_page_en.mp4" </FilenameAlternate>
</Video>

62
xml/page_brewing3.xml
View file

@ -303,6 +303,7 @@
DEBUGVAR NeedUpgrade
Var bg_lidProblem_ST2 = bg_lidProblem_ST
; zone Language
If LanguageObjectShow = "Enable" Then
@ -316,6 +317,11 @@
Var GetLidButtonState = "Invisible"
Var bg_strawProblem_ST = "Invisible"
var EnableGetMoreStrawFileName = "Invisible"
If bg_lidProblem_ST2 = "Invisible" Then
Var GetLidButtonState2 = "Enable"
Var XStraw = 265
EndIf
EndIf
@ -323,6 +329,10 @@
If NoLangObjectShow = "Enable" Then
Var SelectMenuBetweenBrewEnable2 = "Invisible"
Var bg_lidProblem_ST2 = "Invisible"
Var GetLidButtonState2 = "Invisible"
Var bg_strawProblem_ST2 = "Invisible"
var EnableGetMoreStrawFileName2 = "Invisible"
DEBUGVAR bg_lidProblem_ST
@ -1497,7 +1507,7 @@
;
;
;
; Next Order
; Lid button, Get one and report
;
<Button>
<X> 14 </X>
@ -1537,7 +1547,57 @@
</EventClick>
</Button>
<Button>
<X> 14 </X>
<Y> 1787 </Y>
<State>bg_lidProblem_ST2</State>
<Filename> "ROOT/taobin_project/image/page_doing_inter/bn_send_report.png" </Filename>
<FilenamePress>"ROOT/taobin_project/image/page_doing_inter/bn_send_report.png" </FilenamePress>
<EventClick>
Var lidStr = "แจ้งปัญหาไม่ได้รับฝา"
__CMD "lid-alert-disable" 0 lidStr "-"
__CMD "send-error-code" 1343 "-" "-"
Var bg_lidProblem_ST2 = "Invisible"
Refresh
</EventClick>
<Language>
<X> 0 </X>
<Y> 20 </Y>
<Width> 331 </Width>
<Height> 96 </Height>
<ID> 000400 </ID>
</Language>
</Button>
<Button>
<X> 14 </X>
<Y> 1787 </Y>
<State>GetLidButtonState2</State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/page_doing_inter/bn_get_lid.png" </Filename>
<FilenamePress>"ROOT/taobin_project/image/page_doing_inter/bp_get_lid.png" </FilenamePress>
<EventClick>
If GetLidButtonState2 = "Enable" Then
Machine Lid
Var GetLidButtonCountDown = 12
EndIf
Var GetLidButtonState2 = "Press"
Refresh
</EventClick>
<Language>
<X> 0 </X>
<Y> 20 </Y>
<Width> 232 </Width>
<Height> 96 </Height>
<ID> 000403 </ID>
</Language>
</Button>

2
xml/page_catalog.lxml
View file

@ -711,7 +711,7 @@
Var CountDownBrewing = 122
Var BREW_CNT = 122
Var StrawGetMoreState = "Enable"
Var GetLidButtonState = "Enable"
Var bg_lidProblem_ST = "Invisible"
Var InternationalEnable = 1
DEBUGVAR InternationalEnable

24
xml/page_catalog_group_recommend2.xml
View file

@ -11330,8 +11330,28 @@ LIMENADE SODA" </Value>
<X> 42 </X>
<Y> 519 </Y>
<State> OreoBigButtonEnable </State>
<Filename> "ROOT/taobin_project/image/page3/bn_oreo_vo_get1.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page3/bp_oreo_vo_get1.png" </FilenameDisable>
<Filename>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/page3/bn_oreo_vo_get1_en.png"
Else
Var return = "ROOT/taobin_project/image/page3/bn_oreo_vo_get1.png"
EndIf
)
</Filename>
<FilenamePress>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/page3/bp_oreo_vo_get1_en.png"
Else
Var return = "ROOT/taobin_project/image/page3/bp_oreo_vo_get1.png"
EndIf
)
</FilenameDisable>
<EventOnClick>

9
xml/page_payment.xml
View file

@ -133,6 +133,15 @@
Var PlaySoundCodeLang = "ROOT/sounds/Code8digit.m4a"
EndIf
Var PromotionIDCurrentOrder = 0
If PromotionOreoVolcanoEnable = 1 Then
If PD_CODE3 = "12-03-03-0009" Then
Var PromotionIDCurrentOrder = 2
EndIf
EndIf
DEBUGVAR PromotionIDCurrentOrder
SAVELOG MachineStage

82
xml/page_topping_select6.xml
View file

@ -104,8 +104,12 @@
Var text_show_eng = "Enable"
Var topping_shot_price_x = 630
Var text_x_add_oreo_price = 510
Var text_x_add_oreo_price = 430
Var text_show_normal_x = 408
Var text_x_free_adjust = 100
If PromotionOreoToppingFreeEnable = 0 Then
Var text_x_free_adjust = text_x_free_adjust + 5
EndIf
Else
Var DirImage = "ROOT/taobin_project/image/topping2"
@ -118,11 +122,17 @@
Var text_show_eng = "Invisible"
Var topping_shot_price_x = 600
Var text_x_add_oreo_price = 490
Var text_x_add_oreo_price = 420
Var text_show_normal_x = 386
Var text_x_free_adjust = 70
If PromotionOreoToppingFreeEnable = 0 Then
Var text_x_free_adjust = text_x_free_adjust + 30
EndIf
EndIf
Var text_x_free_topping = text_x_add_oreo_price + text_x_free_adjust
Var bg_strawlid = DirImage + "/bg_strawlid.png"
Var bg_straw_only = DirImage + "/bg_straw_only.png"
Var bg_lid_only = DirImage + "/bg_lid_only.png"
@ -298,6 +308,19 @@
Var PromotionIDCurrentOrder = 2
EndIf
EndIf
If PromotionOreoToppingFreeEnable = 1 Then
Var oreo_topping_wed_free = "Enable"
Var oreo_topping_wed_topping = "Invisible"
Else
Var oreo_topping_wed_free = "Invisible"
Var oreo_topping_wed_topping = "Enable"
EndIf
DEBUGVAR PromotionIDCurrentOrder
</EventOpen>
@ -353,8 +376,6 @@
<Button>
<X> 990 </X>
<Y> 438 </Y>
@ -383,8 +404,12 @@
Var text_show_eng = "Enable"
Var topping_shot_price_x = 630
Var text_x_add_oreo_price = 510
Var text_x_add_oreo_price = 430
Var text_show_normal_x = 408
Var text_x_free_adjust = 100
If PromotionOreoToppingFreeEnable = 0 Then
Var text_x_free_adjust = text_x_free_adjust + 5
EndIf
Else
Var DirImage = "ROOT/taobin_project/image/topping2"
@ -397,11 +422,18 @@
Var text_show_eng = "Invisible"
Var topping_shot_price_x = 600
Var text_x_add_oreo_price = 490
Var text_x_add_oreo_price = 420
Var text_show_normal_x = 386
Var text_x_free_adjust = 70
If PromotionOreoToppingFreeEnable = 0 Then
Var text_x_free_adjust = text_x_free_adjust + 30
EndIf
EndIf
Var text_x_free_topping = text_x_add_oreo_price + text_x_free_adjust
Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png"
Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png"
@ -2865,6 +2897,29 @@
</Text>
<Image>
<State> showText8 </State>
<X> 600 </X>
<Y> 6 </Y>
<Filename> Var( DirImage + "/text8.png" ) </Filename>
</Image>
<Image>
<State> oreo_topping_wed_free </State>
<X> text_x_free_topping </X>
<Y> 6 </Y>
<Filename> "ROOT/taobin_project/image/page3/img_oreo_wed_free.png" </Filename>
</Image>
<Image>
<State> oreo_topping_wed_topping</State>
<X> text_x_free_topping </X>
<Y> 6 </Y>
<Filename> "ROOT/taobin_project/image/page3/img_oreo_wed_topping.png" </Filename>
</Image>
</Row1>
@ -3284,9 +3339,13 @@
Machine LidOrder
Var LedLidBlink = "true"
Var bg_lidProblem_ST = "Enable"
Else
If LidState = "Disable" Then
Var bg_lidProblem_ST = "Disable"
Else
Var bg_lidProblem_ST = "Invisible"
EndIf
EndIf
If SelectDrinkType = 0 Then
@ -3846,4 +3905,15 @@
;
<EventUnitTest1>
Var PromotionOreoToppingFreeEnable = 1
DEBUGVAR PromotionOreoToppingFreeEnable
</EventUnitTest1>
<EventUnitTest2>
Var PromotionOreoToppingFreeEnable = 0
DEBUGVAR PromotionOreoToppingFreeEnable
</EventUnitTest2>
</Page>

4
xml_main/startup.xml
View file

@ -106,8 +106,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
Var XMLPageVersion = "700"
Var XMLPageVersionInt = 700
Var XMLPageVersion = "7.02"
Var XMLPageVersionInt = 702
</EventOpen>
<Text>