diff --git a/animation01/sync_4.file b/animation01/sync_4.file
index 1d99229f..5ff74cbe 100644
--- a/animation01/sync_4.file
+++ b/animation01/sync_4.file
@@ -1,6 +1,4 @@
-total 196576
--rw-rw---- 1 root sdcard_rw 27106 2022-05-24 18:41 Menu Description - Sheet1.tsv
--rw-rw---- 1 root sdcard_rw 27080 2022-05-24 18:30 Menu Description - Sheet1_.tsv
+total 196512
-rw-rw---- 1 root sdcard_rw 948282 2020-11-15 19:54 TaoBin2_draft02_art1.mp4
-rw-rw---- 1 root sdcard_rw 3603060 2020-11-15 20:03 TaoBin2_draft02_art10.mp4
-rw-rw---- 1 root sdcard_rw 3166935 2020-11-15 20:03 TaoBin2_draft02_art11.mp4
@@ -49,8 +47,8 @@ total 196576
-rw-rw---- 1 root sdcard_rw 3740266 2020-11-15 19:57 TaoBin2_draft02_art7.mp4
-rw-rw---- 1 root sdcard_rw 3998856 2020-11-15 20:01 TaoBin2_draft02_art8.mp4
-rw-rw---- 1 root sdcard_rw 3616423 2020-11-15 20:01 TaoBin2_draft02_art9.mp4
--rw-rw---- 1 root sdcard_rw 27106 2022-05-24 21:41 playlist.tsv
+-rw-rw---- 1 root sdcard_rw 27827 2022-06-09 22:46 play_list.tsv
-rw-rw---- 1 root sdcard_rw 3431 2022-01-17 11:20 sync_1.file
-rw-rw---- 1 root sdcard_rw 3905 2022-04-26 17:47 sync_2.file
-rw-rw---- 1 root sdcard_rw 4236 2022-06-06 16:36 sync_3.file
--rw-rw---- 1 root sdcard_rw 0 2022-06-06 17:59 sync_4.file
+-rw-rw---- 1 root sdcard_rw 0 2022-06-10 10:04 sync_4.file
diff --git a/xml/page_board.xml b/xml/page_board.xml
index b2357990..44329b1b 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -123,6 +123,10 @@
Var WheyShow = "false"
Var CocktailShow = "true"
Var RoadShow = "true"
+ Else
+ Var WheyShow = "true"
+ Var CocktailShow = "false"
+ Var RoadShow = "false"
EndIf
@@ -143,6 +147,7 @@
Var WheyButtonState = "Enable"
EndIf
+
Var TaobinOnlineX = "true"
DEBUGVAR AppFastEnable
@@ -444,6 +449,10 @@
DEBUGVAR AdvertiseProfile
+ If RoadShow = "true" Then
+ ;Var new_layout = "false"
+ EndIf
+
1000
diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index 5db0d975..cc62627a 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -227,6 +227,11 @@
Var bg_strawProblem_ST = "Invisible"
Var StrawStateX = "Invisible"
Var LidStateX = "Invisible"
+
+ If RoadShow = "true" Then
+ Var EnableSelectMenuBetweenBrewBlink = "Invisible"
+ EndIf
+
@@ -951,6 +956,10 @@
EndIf
EndIf
+ If RoadShow = "true" Then
+ Var EnableSelectMenuBetweenBrewBlink = "Invisible"
+ EndIf
+
Refresh
TimerReset
diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml
index a6138254..46777224 100644
--- a/xml/page_catalog.xml
+++ b/xml/page_catalog.xml
@@ -356,18 +356,6 @@
-; menu row 3
-;
@@ -227,9 +284,14 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- ; eng
- Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml"
+ 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"
+ Else
+ Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml"
+ EndIf
@@ -241,7 +303,12 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+ If new_layout = "true" Then
+ Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
+ Else
+ Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
+ EndIf
@@ -254,7 +321,12 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+ If new_layout = "true" Then
+ Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
+ Else
+ Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
+ EndIf
@@ -266,37 +338,55 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+ If new_layout = "true" Then
+ Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
+ Else
+ Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
+
+ EndIf
-; menu row 3
-;
-
+
+
+
@@ -328,13 +423,15 @@