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

Clean XML

Browse source
This commit is contained in:
kong 2023-02-22 10:28:30 +07:00
parent bc76948f65
commit 64facb1596
60 changed files with 1251 additions and 1655 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/page3/bn_oreo_vo_get1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 57 KiB

Before After
Before After

BIN
image/page3/bp_oreo_vo_get1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 57 KiB

Before After
Before After

BIN
image/page_drink_disable_n2/bn_BananaOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
image/page_drink_disable_n2/bn_CaramelOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.8 KiB

BIN
image/page_drink_disable_n2/bn_ChocoOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
image/page_drink_disable_n2/bn_HojichaOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
image/page_drink_disable_n2/bn_MelonOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
image/page_drink_disable_n2/bn_StrawberrOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
image/page_drink_disable_n2/bn_ThaiTeaOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
image/page_drink_disable_n2/bn_oreo_vo_get1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Before After
Before After

BIN
image/page_drink_disable_n2/bn_oreo_vo_get1_final.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
image/page_drink_n/bn_BananaOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
image/page_drink_n/bn_CaramelOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
image/page_drink_n/bn_ChocoOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
image/page_drink_n/bn_HojichaOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
image/page_drink_n/bn_MelonOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
image/page_drink_n/bn_StrawberrOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
image/page_drink_n/bn_ThaiTeaOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
image/page_drink_n/bn_oreo_vo_get1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Before After
Before After

BIN
image/page_drink_n/bn_oreo_vo_get1_final.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
image/page_drink_picture2_n/bn_BananaOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
image/page_drink_picture2_n/bn_CaramelOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
image/page_drink_picture2_n/bn_ChocoOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
image/page_drink_picture2_n/bn_HojichaOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
image/page_drink_picture2_n/bn_MelonOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
image/page_drink_picture2_n/bn_StrawberrOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
image/page_drink_picture2_n/bn_ThaiTeaOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
image/page_drink_picture2_n/bn_oreo_vo_get1_final.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 35 KiB

BIN
image/page_drink_press_n/bn_BananaOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
image/page_drink_press_n/bn_CaramelOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.6 KiB

BIN
image/page_drink_press_n/bn_ChocoOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.9 KiB

BIN
image/page_drink_press_n/bn_HojichaOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
image/page_drink_press_n/bn_MelonOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
image/page_drink_press_n/bn_StrawberrOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
image/page_drink_press_n/bn_ThaiTeaOreo_smoothie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
image/page_drink_press_n/bn_oreo_vo_get1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Before After
Before After

BIN
image/page_drink_press_n/bn_oreo_vo_get1_final.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 18 KiB

4
xml/menu_catalog_new.xml
View file

@ -179,11 +179,7 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
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>

34
xml/page_board.xml
View file

@ -670,9 +670,7 @@
If SystemDateDayInt = 21 Then
Var PromotionOreoVolcanoEnable = 1
EndIf
If SystemDateDayInt = 22 Then
Var PromotionOreoVolcanoEnable = 1
EndIf
If SystemDateDayInt = 27 Then
Var PromotionOreoVolcanoEnable = 1
EndIf
@ -702,12 +700,6 @@
If SystemDateDayInt = 22 Then
Var PromotionOreoToppingFreeEnable = 1
EndIf
If SystemDateDayInt = 23 Then
Var PromotionOreoToppingFreeEnable = 1
EndIf
If SystemDateDayInt = 24 Then
Var PromotionOreoToppingFreeEnable = 1
EndIf
EndIf
If SystemDateMonthInt = 3 Then
@ -733,10 +725,10 @@
DEBUGVAR $12-03-03-0009.Button
If PromotionOreoVolcanoEnable = 1 Then
Var bn_oreo_vo_get1_full_path = "ROOT/taobin_project/image/page_drink_picture2_n//bn_oreo_vo_get1.png"
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"
Var bn_oreo_vo_get1_full_path = "ROOT/taobin_project/image/page_drink_picture2_n//bn_oreo_vo_get1_final.png"
Var smoothie_oreo_resting = "ROOT/taobin_project/image/page_drink_n//bn_oreo_vo_get1_final.png"
Var smoothie_oreo_press = "ROOT/taobin_project/image/page_drink_press_n//bn_oreo_vo_get1_final.png"
Var smoothie_oreo_disable = "ROOT/taobin_project/image/page_drink_disable_n2//bn_oreo_vo_get1_final.png"
Else
@ -746,15 +738,6 @@
Var bn_oreo_vo_get1_full_path = "ROOT/taobin_project/image/page_drink_picture2_n//bn_smoothie_oreo.png"
EndIf
; cut off
If $12-03-03-0009.Button = "Enable" Then
Else
Var PromotionOreoVolcanoEnable = 0
EndIf
Var PromotionIDCurrentOrder = 0
DEBUGVAR PromotionOreoToppingFreeEnable
@ -883,11 +866,8 @@
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
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend2.xml"
Machine DoorClose

166
xml/page_brewing.xml
View file

@ -1,166 +0,0 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
Var LidState = "Enable"
Var StarwState = "Enable"
</EventOpen>
<Timeout> 800 </Timeout>
<EventTimeout>
Var CountDownBrewing = CountDownBrewing - 1
; run test;
;If CountDownBrewing = 40 Then
; Open "ROOT/taobin_project/xml/page_drinkok.xml"
;EndIf
If CountDownBrewing = 0 Then
Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf
Var ShowCountDownBrewing = CountDownBrewing
If MachineStage = "drink-success" Then
Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf
If MachineStage = "show-menu" Then
Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf
If MachineStage = "close-maintenance" Then
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
If MachineStage = "drink-success" Then
Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf
Refresh
TimerReset
</EventTimeout>
<EventMachine>
If MachineStage = "drink-success" Then
Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf
If MachineStage = "drink-failed" Then
Open "ROOT/taobin_project/xml/page_drinkfail.xml"
EndIf
</EventMachine>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
<Image>
<X> 751 </X>
<Y> 413 </Y>
<Filename> "ROOT/taobin_project/image/page_doing/img2.png" </Filename>
</Image>
<Image>
<X> 237 </X>
<Y> 1323 </Y>
<Filename> "ROOT/taobin_project/image/page_doing/text1.png" </Filename>
</Image>
<Text>
<X> 808 </X>
<Y> 480 </Y>
<Width> 1080</Width>
<Align> "Hurr" </Align>
<Size> 88 </Size>
<Font> "ROOT/taobin_project/font/Roboto/Roboto-Regular.ttf"</Font>
<Color> 0x513C2F </Color>
<Value> ShowCountDownBrewing </Value>
</Text>
<Text>
<X> 0 </X>
<Y> 1367 </Y>
<Width> 1080 </Width>
<Size> 72 </Size>
<Align> Center </Align>
<Font> RobotoBlack </Font>
<Color> 0x513C2F </Color>
<Value> BrewingTextThai </Value>
</Text>
;BrewingTextThai
<GIF>
<X> 182 </X>
<Y> 700 </Y>
<Filename> GIFShowProcess </Filename>
</GIF>
;<Text>
;<X> 0 </X>
;<Y> 1880 </Y>
;<Size> 30 </Size>
;<Align> Center </Align>
;<Width> 1080 </Width>
;<Font> RobotoBlack </Font>
;<Color> 0x513C2F </Color>
;<Value> MachineStage </Value>
;</Text>
;<Button>
;<X> 0 </X>
;<Y> 1860 </Y>
;<Width> 200 </Width>
;<Height> 50 </Height>
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
;<Volume> SoundVolume </Volume>
;<EventClick>
; Var countClick = countClick + 1
; If countClick = 3 Then
;
; EndIf
;
; If countClick = 5 Then
; Var countClick = 0
; MainMenu
; EndIf
; Refresh
;</EventClick>
;</Button>
<Text>
<X> 0 </X>
<Y> 1886 </Y>
<Size> 20 </Size>
<Width> 1080</Width>
<Align> Center </Align>
<Font> RobotoBlack </Font>
<Color> 0x513C2F </Color>
<Value> countClick </Value>
</Text>
</Popup>

0
xml/page_brewing2.xml → xml/page_brewing_test_loop.xml
View file

3
xml/page_catalog.lxml
View file

@ -697,7 +697,7 @@
</EventUnitTest1>
<EventUnitTest2>
Var waitAckPay = 1
Var waitAckPay = 0
Var CountDownBrewing = 122
Var InternationalEnable = 1
@ -711,6 +711,7 @@
EndIf
Var Top2Timeout = 19
DEBUGVAR CountDownBrewing
</EventUnitTest2>
</Popup>

9
xml/page_catalog.xml
View file

@ -6,7 +6,7 @@
<Volume> SoundVolume </Volume>
<EventOpen>
If SpiralOnline = "true" Then
If Seeker = "next" Then
@ -336,11 +336,8 @@
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
; eng
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
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
</EventClick>
</Button>

7
xml/page_catalog2.xml
View file

@ -337,11 +337,8 @@
<EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.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
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
</EventClick>
</Button>

4
xml/page_catalog_group_appfast.xml
View file

@ -326,11 +326,7 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
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>

4
xml/page_catalog_group_cocktail.xml
View file

@ -318,11 +318,7 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
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>

4
xml/page_catalog_group_coffee.xml
View file

@ -318,11 +318,7 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
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>

4
xml/page_catalog_group_forkid.xml
View file

@ -327,11 +327,7 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
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>

4
xml/page_catalog_group_health.xml
View file

@ -318,11 +318,7 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
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>

4
xml/page_catalog_group_milk.xml
View file

@ -316,11 +316,7 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
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>

45
xml/page_catalog_group_oreo.skt
View file

@ -1,45 +0,0 @@
<?hurr
#include=menu_head.py
?>
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
<?hurr
#include=menu_catalog_default_init.xml
?>
Var Timeout = 0
<?hurr
#include=menu_catalog_new_menu.xml
?>
</EventOpen>
<?hurr
#include=menu_catalog_inc.py
?>
<?hurr
#include=menu_new_layout_gen_v2.py
?>
<?hurr
#include=menu_new_layout_gen.py
?>
</Popup>

1041
xml/page_catalog_group_oreo.xml
View file

File diff suppressed because it is too large Load diff

4
xml/page_catalog_group_other.xml
View file

@ -317,11 +317,7 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
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>

4
xml/page_catalog_group_recommend.xml
View file

@ -324,11 +324,7 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
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>

1548
xml/page_catalog_group_recommend2.xml
View file

File diff suppressed because it is too large Load diff

4
xml/page_catalog_group_tea.xml
View file

@ -318,11 +318,7 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
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>

4
xml/page_catalog_group_whey.xml
View file

@ -323,11 +323,7 @@
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
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>

2
xml/page_catalog_with_vending.xml
View file

@ -280,7 +280,7 @@
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
; eng
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml"
</EventClick>
</Button>

5
xml/page_lid_straw.xml
View file

@ -164,12 +164,9 @@
Var CountDownBrewing = CountDownBrewing - 1
EndIf
; run test;
;If CountDownBrewing = 58 Then
; Open "ROOT/taobin_project/xml/page_brewing.xml"
;EndIf
Var LidStrawCountDown = LidStrawCountDown - 1
; count down
If LidStrawCountDown = 1 Then
Var LidStrawCountDown = 10

2
xml/page_thankyou.xml
View file

@ -261,7 +261,7 @@
EndIf
If TestLoopMakeDrink = 1 Then
Open "ROOT/taobin_project/xml/page_brewing2.xml"
Open "ROOT/taobin_project/xml/page_brewing_test_loop.xml"
EndIf
Var CountDownBrewing = BrewTime