From b3277e5871bbf55f4da590b9bcb041f4b32c5a11 Mon Sep 17 00:00:00 2001
From: kong <wanlop@forth.co.th>
Date: Tue, 13 Dec 2022 19:57:35 +0700
Subject: [PATCH] 6.81

---
 video/sync_1.file     |   5 +-
 xml/page_catalog.lxml | 207 +++++++++++++++++++++++++-----------------
 xml_main/startup.xml  |   4 +-
 3 files changed, 129 insertions(+), 87 deletions(-)

diff --git a/video/sync_1.file b/video/sync_1.file
index a78a92c9..e60cf2c6 100644
--- a/video/sync_1.file
+++ b/video/sync_1.file
@@ -1,10 +1,9 @@
-total 54540
--rw-rw---- 1 root sdcard_rw  9268737 2022-09-28 15:26 _main_page.mp4
+total 45484
 -rw-rw---- 1 root sdcard_rw  9268737 2022-09-28 15:26 main_page.mp4
 -rw-rw---- 1 root sdcard_rw 12369225 2022-12-08 15:58 main_page_event.mp4
 -rw-rw---- 1 root sdcard_rw      455 2022-12-09 17:08 script1.ev
 -rw-rw---- 1 root sdcard_rw      265 2022-12-09 17:09 script2.ev
--rw-rw---- 1 root sdcard_rw        0 2022-12-09 17:08 sync_1.file
+-rw-rw---- 1 root sdcard_rw        0 2022-12-09 17:11 sync_1.file
 -rw-rw---- 1 root sdcard_rw   557065 2021-02-18 15:05 taobin_brewing.mov
 -rw-rw---- 1 root sdcard_rw   920095 2021-02-18 15:05 taobin_drink_ok.mov
 -rw-rw---- 1 root sdcard_rw  4806758 2022-06-13 18:43 taobin_save_world1.mp4
diff --git a/xml/page_catalog.lxml b/xml/page_catalog.lxml
index feae0680..c67d03b9 100644
--- a/xml/page_catalog.lxml
+++ b/xml/page_catalog.lxml
@@ -251,18 +251,6 @@
 
 
 
-;<Video>
-;<X> 0 </X>
-;<Y> 0 </Y>
-;<Width> 1080</Width>
-;<Height> 380 </Height>
-;<Loop> "true" </Loop>
-;<Filename> video_menu_0 </Filename>
-;
-;</Video>
-
-
-
 ; back
 <Button>
 <X> 19 </X>
@@ -280,38 +268,41 @@
 </EventClick>
 </Button>
 
-<Button>
+<LangSwitch>
 <X> 990 </X>
 <Y> 438 </Y>
-<Filename> show_btn </Filename>
-<FilenamePress> show_btp  </FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
 <EventClick> 
 	; eng
-	If show_eng = "true" Then 
-		Var show_eng = "false"
-	Else
-		Var show_eng = "true"
-	EndIf
-	Open CurrentXMLFileName2
+	SetLanguage "TOGGLE"
+	RefreshAll
+	;Open CurrentXMLFileName2
 </EventClick>
-</Button>
+</LangSwitch>
 
 
 
-<Image>
-<X> 70 </X>
-<Y> 583 </Y>
-<Filename> Var(DirImage + "/text1.png")  </Filename>
-</Image>
+<Language>
+	<ID> 000001 </ID>
+	<X> 70 </X>
+	<Y> 591 </Y>
+	<Width> 940 </Width>
+	<Height> 85 </Height>
+</Language>
 
 
+<Language>
+	<ID> 000002 </ID>
+	<X> 70 </X>
+	<Y> 679 </Y>
+	<Width> 940 </Width>
+	<Height> 85 </Height>
+</Language>
+
 
 ; menu row 1
 <Button>
-<X> 205 </X>
-<Y> 849 </Y>
+<X> 220 </X>
+<Y> 844 </Y>
 <Filename> Var(DirImage + "/bn_diy.png")   </Filename>
 <FilenamePress> Var(DirImage + "/bp_diy.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -325,75 +316,83 @@
 </EventClick>
 <Language>
 	<ID> 000003 </ID>
-	<X> 66 </X>
+	<X> 30 </X>
 	<Y> 193 </Y>
-	<Width> 163 </Width>
+	<Width> 237 </Width>
 	<Height> 72 </Height>
-
-	<Value> "Test" </Value>
-	<Color> 0x000000 </Color>
-	<Size>50</Size>
 </Language>
 </Button>
 
 <Button>
-<X> 579 </X>
-<Y> 849 </Y>
+<X> 564 </X>
+<Y> 844 </Y>
 <Filename> Var(DirImage + "/bn_coffee.png") </Filename>
 <FilenamePress> Var(DirImage + "/bp_coffee.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	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
+	
+	Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" 
+	
 </EventClick>
+<Language>
+	<ID> 000005 </ID>
+	<X> 30 </X>
+	<Y> 193 </Y>
+	<Width> 237 </Width>
+	<Height> 72 </Height>
+</Language>
 </Button>
 
 ; menu row 2
 <Button>
-<X> 205 </X>
-<Y> 1191 </Y>
+<X> 47 </X>
+<Y> 1188 </Y>
 <Filename> Var(DirImage + "/bn_tea.png") </Filename>
 <FilenamePress>  Var(DirImage + "/bp_tea.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	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
+	Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" 
+
 </EventClick>
+<Language>
+	<ID> 000006 </ID>
+	<X> 30 </X>
+	<Y> 193 </Y>
+	<Width> 237 </Width>
+	<Height> 72 </Height>
+</Language>
 </Button>
 
 <Button>
-<X> 579 </X>
-<Y> 1191 </Y>
+<X> 391 </X>
+<Y> 1188 </Y>
 <Filename> Var(DirImage + "/bn_cho_caramel.png") </Filename>
 <FilenamePress> Var(DirImage + "/bp_cho_caramel.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	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" 
+	Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" 
 
-	EndIf
 </EventClick>
+<Language>
+	<ID> 000007 </ID>
+	<X> 30 </X>
+	<Y> 193 </Y>
+	<Width> 237 </Width>
+	<Height> 72 </Height>
+</Language>
 </Button>
 
 
 
 <Button>
-<X> 205 </X>
-<Y> 1533 </Y>
+<X> 219 </X>
+<Y> 1532 </Y>
 <State>WheyButtonState</State>
 <Filename> Var(DirImage + "/bn_protein.png") </Filename>
 <FilenamePress> Var(DirImage + "/bp_protein.png") </FilenamePress>
@@ -401,18 +400,22 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-	If new_layout = "true" Then
-		Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml" 
-	Else
-		Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
-	EndIf
+	Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml" 
+
 </EventClick>
+<Language>
+	<ID> 000007 </ID>
+	<X> 30 </X>
+	<Y> 193 </Y>
+	<Width> 237 </Width>
+	<Height> 72 </Height>
+</Language>
 </Button>
 
 
 <Button>
-<X> 205 </X>
-<Y> 1533 </Y>
+<X> 219 </X>
+<Y> 1532 </Y>
 <State>MenuKidButtonState</State>
 <Filename> Var(DirImage + "/bn_kidmenu.png") </Filename>
 <FilenamePress> Var(DirImage + "/bn_kidmenu.png") </FilenamePress>
@@ -420,14 +423,21 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-		Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" 
+	Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" 
 	
 </EventClick>
+<Language>
+	<ID> 000011 </ID>
+	<X> 30 </X>
+	<Y> 211 </Y>
+	<Width> 237 </Width>
+	<Height> 72 </Height>
+</Language>
 </Button>
 
 <Button>
-<X> 205 </X>
-<Y> 1533 </Y>
+<X> 219 </X>
+<Y> 1532 </Y>
 <State>AppFastButtonState</State>
 <Filename> Var(DirImage + "/bn_appfast.png") </Filename>
 <FilenamePress> Var(DirImage + "/bp_appfast.png") </FilenamePress>
@@ -435,33 +445,66 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-	If new_layout = "true" Then
-		Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" 
-	Else
-		Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
-	EndIf
+	Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" 
+
 </EventClick>
+<Language>
+	<ID> 000012 </ID>
+	<X> 30 </X>
+	<Y> 193 </Y>
+	<Width> 237 </Width>
+	<Height> 72 </Height>
+</Language>
 </Button>
 
 
 <Button>
-<X> 579 </X>
-<Y> 1533 </Y>
+<X> 748 </X>
+<Y> 1188 </Y>
 <Filename> bnSodaAndOther </Filename>
 <FilenamePress> bpSodaAndOther </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-	If new_layout = "true" Then
-		Open "ROOT/taobin_project/xml/page_catalog_group_other.xml" 
-	Else
-		Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
-	EndIf
+	Open "ROOT/taobin_project/xml/page_catalog_group_other.xml" 
 </EventClick>
+<Language>
+	<ID> 000009 </ID>
+	<X> 30 </X>
+	<Y> 193 </Y>
+	<Width> 237 </Width>
+	<Height> 72 </Height>
+</Language>
 </Button>
 
 
+<Button>
+<X> 564 </X>
+<Y> 1532 </Y>
+<State> "Enable" </State>
+<Filename> Var(DirImage + "/bn_HealthyOption.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_HealthyOption.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	
+	Open "ROOT/taobin_project/xml/page_catalog_group_health.xml" 
+	
+</EventClick>
+<Language>
+	<ID> 000010 </ID>
+	<X> 30 </X>
+	<Y> 200 </Y>
+	<Width> 237 </Width>
+	<Height> 72 </Height>
+</Language>
+</Button>
+
+
+;###############################################################
+
 <Button>
 <X> 225 </X>
 <Y> 424 </Y>
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index 201d5aaa..0da2433c 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -106,8 +106,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "6.80"
-	Var XMLPageVersionInt = 680
+	Var XMLPageVersion = "6.81"
+	Var XMLPageVersionInt = 681
 </EventOpen>
 
 <Text>