diff --git a/inter/aus/animation01/play_list.tsv b/inter/aus/animation01/play_list.tsv
index e8151e20..ee2f9264 100644
--- a/inter/aus/animation01/play_list.tsv
+++ b/inter/aus/animation01/play_list.tsv
@@ -851,3 +851,11 @@ Hot Coconut Matcha tea 51-02-01-0061 1 8 9 62 24 120 17:00 23
Frappe Vanilla Caramel Latte 51-21-03-0079 1 2 3 4 5 63 22 23 41 24 120 17:00 23
Hot strawberry matcha 51-02-01-0071 1 8 9 19 70 24 120 17:00 23
Frappe strawberry matcha latte 51-02-03-0071 1 8 9 19 70 23 41 24 120 17:00 23
+
+Yuzu Turtle Power Energy 51-05-02-9990 1 53 34 13 23 24 120 17:00 23
+Strawberry Turtle Power Energy 51-05-02-9991 1 19 34 13 23 24 120 17:00 23
+Coconut Turtle Power Energy 51-05-02-9992 1 62 34 13 23 24 120 17:00 23
+Mint Turtle Power Energy 51-05-02-9993 1 59 34 13 23 24 120 17:00 23
+Vanilla Turtle Power Energy 51-05-02-9994 1 34 13 23 24 120 17:00 23
+Caramel Turtle Power Energy 51-05-02-9995 1 22 34 13 23 24 120 17:00 23
+Lychee Turtle Power Energy 51-05-02-9996 1 11 34 13 23 24 120 17:00 23
diff --git a/inter/aus/configure.ev b/inter/aus/configure.ev
index 07532c6e..25be22a5 100644
--- a/inter/aus/configure.ev
+++ b/inter/aus/configure.ev
@@ -1,6 +1,6 @@
If BoxID = 200027 Then
- Var EnableMultiInstanceFromBoxID = 1
+ Var EnableMultiInstanceFromBoxID = 0
EndIf
READ_FILE "/mnt/sdcard/enable_ui_v3" EnableMultiInstanceFromConfig
diff --git a/inter/aus/image/catalog/bn_energy_drink.png b/inter/aus/image/catalog/bn_energy_drink.png
new file mode 100644
index 00000000..1f109131
Binary files /dev/null and b/inter/aus/image/catalog/bn_energy_drink.png differ
diff --git a/inter/aus/image/catalog/bp_energy_drink.png b/inter/aus/image/catalog/bp_energy_drink.png
new file mode 100644
index 00000000..935a7eb4
Binary files /dev/null and b/inter/aus/image/catalog/bp_energy_drink.png differ
diff --git a/inter/aus/image/page3_2_en/bn_energy_drink.png b/inter/aus/image/page3_2_en/bn_energy_drink.png
new file mode 100644
index 00000000..c2dfe437
Binary files /dev/null and b/inter/aus/image/page3_2_en/bn_energy_drink.png differ
diff --git a/inter/aus/image/page3_2_en/bp_energy_drink.png b/inter/aus/image/page3_2_en/bp_energy_drink.png
new file mode 100644
index 00000000..f0e5db30
Binary files /dev/null and b/inter/aus/image/page3_2_en/bp_energy_drink.png differ
diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Caramel_soda.png b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Caramel_soda.png
new file mode 100644
index 00000000..b9d4b703
Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Caramel_soda.png differ
diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Coconut_soda.png b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Coconut_soda.png
new file mode 100644
index 00000000..5e38c5d5
Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Coconut_soda.png differ
diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Lychee_soda.png b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Lychee_soda.png
index 58406d11..6f79eac9 100644
Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Lychee_soda.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Lychee_soda.png differ
diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda.png b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda.png
index 634b7ad0..3d5edebf 100644
Binary files a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda.png and b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda.png differ
diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Strawberry_soda.png b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Strawberry_soda.png
new file mode 100644
index 00000000..e162f8f9
Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Strawberry_soda.png differ
diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Vanilla_soda.png b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Vanilla_soda.png
new file mode 100644
index 00000000..bc0e857b
Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Vanilla_soda.png differ
diff --git a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Yuzu_soda.png b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Yuzu_soda.png
new file mode 100644
index 00000000..e8b4285d
Binary files /dev/null and b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Yuzu_soda.png differ
diff --git a/inter/aus/image/page_drink_n/bn_iced_energy_drink_Caramel_soda.png b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Caramel_soda.png
new file mode 100644
index 00000000..226c7085
Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Caramel_soda.png differ
diff --git a/inter/aus/image/page_drink_n/bn_iced_energy_drink_Coconut_soda.png b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Coconut_soda.png
new file mode 100644
index 00000000..df20ed2f
Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Coconut_soda.png differ
diff --git a/inter/aus/image/page_drink_n/bn_iced_energy_drink_Lychee_soda.png b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Lychee_soda.png
index b0adba40..5b336346 100644
Binary files a/inter/aus/image/page_drink_n/bn_iced_energy_drink_Lychee_soda.png and b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Lychee_soda.png differ
diff --git a/inter/aus/image/page_drink_n/bn_iced_energy_drink_Mint_soda.png b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Mint_soda.png
index b3d766a7..984b3eeb 100644
Binary files a/inter/aus/image/page_drink_n/bn_iced_energy_drink_Mint_soda.png and b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Mint_soda.png differ
diff --git a/inter/aus/image/page_drink_n/bn_iced_energy_drink_Strawberry_soda.png b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Strawberry_soda.png
new file mode 100644
index 00000000..087bee32
Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Strawberry_soda.png differ
diff --git a/inter/aus/image/page_drink_n/bn_iced_energy_drink_Vanilla_soda.png b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Vanilla_soda.png
new file mode 100644
index 00000000..458bba6f
Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Vanilla_soda.png differ
diff --git a/inter/aus/image/page_drink_n/bn_iced_energy_drink_Yuzu_soda.png b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Yuzu_soda.png
new file mode 100644
index 00000000..46920e76
Binary files /dev/null and b/inter/aus/image/page_drink_n/bn_iced_energy_drink_Yuzu_soda.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Caramel_soda.png b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Caramel_soda.png
new file mode 100644
index 00000000..eb29fc43
Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Caramel_soda.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Coconut_soda.png b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Coconut_soda.png
new file mode 100644
index 00000000..554c3d75
Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Coconut_soda.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Lychee_soda.png b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Lychee_soda.png
index 263dbb37..6da4eb43 100755
Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Lychee_soda.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Lychee_soda.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Mint_soda.png b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Mint_soda.png
index da8625e9..82163b77 100755
Binary files a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Mint_soda.png and b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Mint_soda.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Strawberry_soda.png b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Strawberry_soda.png
new file mode 100644
index 00000000..46772725
Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Strawberry_soda.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Vanilla_soda.png b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Vanilla_soda.png
new file mode 100644
index 00000000..db208022
Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Vanilla_soda.png differ
diff --git a/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Yuzu_soda.png b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Yuzu_soda.png
new file mode 100644
index 00000000..f9f9be34
Binary files /dev/null and b/inter/aus/image/page_drink_picture2_n/bn_iced_energy_drink_Yuzu_soda.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Caramel_soda.png b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Caramel_soda.png
new file mode 100644
index 00000000..ebe9b09b
Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Caramel_soda.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Coconut_soda.png b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Coconut_soda.png
new file mode 100644
index 00000000..636f4ddd
Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Coconut_soda.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Lychee_soda.png b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Lychee_soda.png
index 26d32d4d..7aadb7f1 100644
Binary files a/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Lychee_soda.png and b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Lychee_soda.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Mint_soda.png b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Mint_soda.png
index 25f49a8b..a8d4ec2b 100644
Binary files a/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Mint_soda.png and b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Mint_soda.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Strawberry_soda.png b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Strawberry_soda.png
new file mode 100644
index 00000000..2f06c98c
Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Strawberry_soda.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Vanilla_soda.png b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Vanilla_soda.png
new file mode 100644
index 00000000..0e22aeb5
Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Vanilla_soda.png differ
diff --git a/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Yuzu_soda.png b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Yuzu_soda.png
new file mode 100644
index 00000000..e053ea25
Binary files /dev/null and b/inter/aus/image/page_drink_press_n/bn_iced_energy_drink_Yuzu_soda.png differ
diff --git a/inter/aus/menu/lang.tsv b/inter/aus/menu/lang.tsv
index 3b832b5d..2df2442d 100644
--- a/inter/aus/menu/lang.tsv
+++ b/inter/aus/menu/lang.tsv
@@ -18,6 +18,7 @@ TextID Note English Thai
000011 Kid Menu เมนูเด็ก
000012 App Fast แอพ ฟาสท์
000025 Dessert ของหวาน
+000026 Energy Drink Energy Drink
Menu
Font=Kanit,Type=Regular,Size=16,Color=0x5A5A5A,Align=center-vertical-horizontal Font=Kanit,Type=Regular,Size=32,Color=0x5A5A5A,Align=center-vertical-horizontal
diff --git a/inter/aus/xml/menu_catalog_default_init.lxml b/inter/aus/xml/menu_catalog_default_init.lxml
index ee99a462..8e15f997 100644
--- a/inter/aus/xml/menu_catalog_default_init.lxml
+++ b/inter/aus/xml/menu_catalog_default_init.lxml
@@ -6,15 +6,15 @@
DEBUGVAR LanguageShow
DEBUGVAR CountryName
-
- If LanguageShow = "ENG" Then
+
+ If LanguageShow = "ENG" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
-
+
EndIf
- If LanguageShow = "THAI" Then
+ If LanguageShow = "THAI" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
@@ -28,7 +28,7 @@
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
-
+
;inter-image
If CountryName = "Australia" Then
@@ -37,7 +37,7 @@
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
-
+
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
@@ -48,14 +48,14 @@
; SpiralOnline
-
+
Var MenuVSelected2 = "Invisible"
Var Menu1Selected2 = "Invisible"
Var Menu2Selected2 = "Invisible"
Var Menu3Selected2 = "Invisible"
Var Menu4Selected2 = "Invisible"
-
+
Var Menu6Selected2 = "Invisible"
Var Menu7Selected2 = "Invisible"
Var MenuVSelected2 = "Invisible"
@@ -64,12 +64,12 @@
Var Menu21Selected2 = "Invisible"
Var MenuVSelected2 = "Invisible"
- If SpiralOnline = "true" Then
+ If SpiralOnline = "true" Then
If Seeker = "curr" Then
Var MenuVSelected2 = "Enable"
EndIf
- EndIf
-
+ EndIf
+
; init default
Var Menu1Selected = "Enable"
Var Menu2Selected = "Enable"
@@ -82,44 +82,41 @@
; 8 cocktail
Var Menu8Selected = "Invisible"
- If CocktailShow = "true" Then
+ If CocktailShow = "true" Then
Var Menu7Selected = "Invisible"
Var Menu8Selected = "Enable"
EndIf
-
+
If AppFastEnable = "true" Then
- Var Menu11Selected = "Enable"
- Var Menu21Selected = "Invisible"
+ Var Menu11Selected = "Enable"
+ Var Menu21Selected = "Invisible"
Var Menu7Selected = "Invisible"
Else
If MenuKidEnable = "true" Then
- Var Menu11Selected = "Invisible"
+ Var Menu11Selected = "Invisible"
Var Menu21Selected = "Enable"
Var Menu7Selected = "Invisible"
Else
Var Menu11Selected = "Invisible"
- Var Menu21Selected = "Invisible"
+ Var Menu21Selected = "Invisible"
Var Menu7Selected = "Enable"
EndIf
EndIf
If CocktailShow = "true" Then
Var Menu7Selected = "Invisible"
- EndIf
-
- If RecipeTag1 = "HealthTurnOn" Then
- Var Menu22Selected = "Enable"
- Else
- Var Menu22Selected = "Invisible"
EndIf
- If WinterWarmersCatalogFlag = 1 Then
- Var MenuWinterWarmersCatalogState = "Enable"
- Else
- Var MenuWinterWarmersCatalogState = "Invisible"
- EndIf
- DEBUGVAR WinterWarmersCatalogFlag
- DEBUGVAR MenuWinterWarmersCatalogState
+ Var Menu22Selected = "Enable"
+ Var Menu23Selected = "Enable"
+
+ ;If WinterWarmersCatalogFlag = 1 Then
+ ; Var MenuWinterWarmersCatalogState = "Enable"
+ ;Else
+ ; Var MenuWinterWarmersCatalogState = "Invisible"
+ ;EndIf
+ ;DEBUGVAR WinterWarmersCatalogFlag
+ ;DEBUGVAR MenuWinterWarmersCatalogState
;
-
+
diff --git a/inter/aus/xml/menu_catalog_new.lxml b/inter/aus/xml/menu_catalog_new.lxml
index e8248538..eb511af2 100644
--- a/inter/aus/xml/menu_catalog_new.lxml
+++ b/inter/aus/xml/menu_catalog_new.lxml
@@ -384,6 +384,26 @@
+
+
-
+ ;
diff --git a/inter/aus/xml/open_page_catalog.ev b/inter/aus/xml/open_page_catalog.ev
index 6f6c2892..5301cc18 100644
--- a/inter/aus/xml/open_page_catalog.ev
+++ b/inter/aus/xml/open_page_catalog.ev
@@ -1,3 +1,4 @@
+DEBUGVAR EnableMultiInstance
If EnableMultiInstance = "true" Then
Var OpenFromPageBoard = 1
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
diff --git a/inter/aus/xml/page_catalog.lxml b/inter/aus/xml/page_catalog.lxml
index 2c24f064..d0c1e66e 100644
--- a/inter/aus/xml/page_catalog.lxml
+++ b/inter/aus/xml/page_catalog.lxml
@@ -493,7 +493,8 @@