From 42af39c6cc8ee4c50d9691fb4d5f3961c0138791 Mon Sep 17 00:00:00 2001
From: kong <wanlop@forth.co.th>
Date: Fri, 16 Dec 2022 12:57:36 +0700
Subject: [PATCH] DO version 6.82

---
 video/script2.ev         |  3 ++
 video/sync_1.file        | 10 ++---
 xml/page_cannotConti.xml | 12 +++---
 xml/page_catalog.lxml    | 92 ++++++++++++++++++++--------------------
 xml_main/startup.xml     |  4 +-
 5 files changed, 63 insertions(+), 58 deletions(-)

diff --git a/video/script2.ev b/video/script2.ev
index 0fdf8a74..8ac4c44c 100644
--- a/video/script2.ev
+++ b/video/script2.ev
@@ -9,3 +9,6 @@ If MainfileSize = 3796502 Then
 		Var video_file_name = "ROOT/taobin_project/video/taobin_thank1_event.mp4"
 	EndIf
 EndIf
+
+DEBUGVAR video_file_name
+
diff --git a/video/sync_1.file b/video/sync_1.file
index e60cf2c6..492abf48 100644
--- a/video/sync_1.file
+++ b/video/sync_1.file
@@ -1,14 +1,14 @@
-total 45484
+total 56424
 -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  8679952 2022-09-28 02:41 main_page_event_alter.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: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      292 2022-12-13 22:19 script2.ev
+-rw-rw---- 1 root sdcard_rw        0 2021-03-18 17:19 sync_1.file
 -rw-rw---- 1 root sdcard_rw  4806758 2022-06-13 18:43 taobin_save_world1.mp4
 -rw-rw---- 1 root sdcard_rw  6428830 2022-06-13 18:43 taobin_save_world2.mp4
 -rw-rw---- 1 root sdcard_rw  4634942 2022-06-13 18:43 taobin_save_world3.mp4
 -rw-rw---- 1 root sdcard_rw  2084830 2022-06-13 18:43 taobin_thank1.mp4
 -rw-rw---- 1 root sdcard_rw  3796502 2022-12-08 15:57 taobin_thank1_event.mp4
+-rw-rw---- 1 root sdcard_rw  3999239 2022-09-27 02:04 taobin_thank1_event_alter.mp4
 -rw-rw---- 1 root sdcard_rw  1631940 2022-06-13 18:43 taobin_thank2.mp4
diff --git a/xml/page_cannotConti.xml b/xml/page_cannotConti.xml
index b1cd4e1d..347dc06b 100644
--- a/xml/page_cannotConti.xml
+++ b/xml/page_cannotConti.xml
@@ -452,9 +452,9 @@
 
 					Var PayDetail = "1/" + HURR_FOREVER
 					Var PayDetail = PayDetail + "/"  
-					Var PayDetail = PayDetail + SAMESALARY
+					Var PayDetail = PayDetail + ""
 					Var PayDetail = PayDetail + "/"
-					Var PayDetail = PayDetail + NOBONUS
+					Var PayDetail = PayDetail + ""
 					Var PayDetail = PayDetail + "/XML|"
 					Var PayDetail = PayDetail +  Seeker.OrderChanel
 				EndIf
@@ -520,9 +520,9 @@
 
 					Var PayDetail = "1/" + HURR_FOREVER
 					Var PayDetail = PayDetail + "/"  
-					Var PayDetail = PayDetail + SAMESALARY
+					Var PayDetail = PayDetail + ""
 					Var PayDetail = PayDetail + "/"
-					Var PayDetail = PayDetail + NOBONUS
+					Var PayDetail = PayDetail + ""
 					Var PayDetail = PayDetail + "/XML|"
 					Var PayDetail = PayDetail +  Seeker.OrderChanel
 				EndIf
@@ -582,9 +582,9 @@
 
 					Var PayDetail = "1/" + HURR_FOREVER
 					Var PayDetail = PayDetail + "/"  
-					Var PayDetail = PayDetail + SAMESALARY
+					Var PayDetail = PayDetail + ""
 					Var PayDetail = PayDetail + "/"
-					Var PayDetail = PayDetail + NOBONUS
+					Var PayDetail = PayDetail + ""
 					Var PayDetail = PayDetail + "/XML|"
 					Var PayDetail = PayDetail +  Seeker.OrderChanel
 
diff --git a/xml/page_catalog.lxml b/xml/page_catalog.lxml
index c67d03b9..d065c776 100644
--- a/xml/page_catalog.lxml
+++ b/xml/page_catalog.lxml
@@ -316,9 +316,9 @@
 </EventClick>
 <Language>
 	<ID> 000003 </ID>
-	<X> 30 </X>
-	<Y> 193 </Y>
-	<Width> 237 </Width>
+	<X> 28 </X>
+	<Y> 202 </Y>
+	<Width> 241 </Width>
 	<Height> 72 </Height>
 </Language>
 </Button>
@@ -338,9 +338,9 @@
 </EventClick>
 <Language>
 	<ID> 000005 </ID>
-	<X> 30 </X>
-	<Y> 193 </Y>
-	<Width> 237 </Width>
+	<X> 28 </X>
+	<Y> 202 </Y>
+	<Width> 241 </Width>
 	<Height> 72 </Height>
 </Language>
 </Button>
@@ -360,9 +360,9 @@
 </EventClick>
 <Language>
 	<ID> 000006 </ID>
-	<X> 30 </X>
+	<X> 28 </X>
 	<Y> 193 </Y>
-	<Width> 237 </Width>
+	<Width> 241 </Width>
 	<Height> 72 </Height>
 </Language>
 </Button>
@@ -381,33 +381,9 @@
 </EventClick>
 <Language>
 	<ID> 000007 </ID>
-	<X> 30 </X>
+	<X> 28 </X>
 	<Y> 193 </Y>
-	<Width> 237 </Width>
-	<Height> 72 </Height>
-</Language>
-</Button>
-
-
-
-<Button>
-<X> 219 </X>
-<Y> 1532 </Y>
-<State>WheyButtonState</State>
-<Filename> Var(DirImage + "/bn_protein.png") </Filename>
-<FilenamePress> Var(DirImage + "/bp_protein.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_whey.xml" 
-
-</EventClick>
-<Language>
-	<ID> 000007 </ID>
-	<X> 30 </X>
-	<Y> 193 </Y>
-	<Width> 237 </Width>
+	<Width> 241 </Width>
 	<Height> 72 </Height>
 </Language>
 </Button>
@@ -428,9 +404,9 @@
 </EventClick>
 <Language>
 	<ID> 000011 </ID>
-	<X> 30 </X>
+	<X> 28 </X>
 	<Y> 211 </Y>
-	<Width> 237 </Width>
+	<Width> 241 </Width>
 	<Height> 72 </Height>
 </Language>
 </Button>
@@ -450,9 +426,9 @@
 </EventClick>
 <Language>
 	<ID> 000012 </ID>
-	<X> 30 </X>
-	<Y> 193 </Y>
-	<Width> 237 </Width>
+	<X> 28 </X>
+	<Y> 211 </Y>
+	<Width> 241 </Width>
 	<Height> 72 </Height>
 </Language>
 </Button>
@@ -471,9 +447,35 @@
 </EventClick>
 <Language>
 	<ID> 000009 </ID>
-	<X> 30 </X>
-	<Y> 193 </Y>
-	<Width> 237 </Width>
+	<X> 28 </X>
+	<Y> 211 </Y>
+	<Width> 241 </Width>
+	<Height> 72 </Height>
+</Language>
+</Button>
+
+;###############################################################
+
+
+
+<Button>
+<X> 219 </X>
+<Y> 1532 </Y>
+<State>WheyButtonState</State>
+<Filename> Var(DirImage + "/bn_protein.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_protein.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_whey.xml" 
+
+</EventClick>
+<Language>
+	<ID> 000008 </ID>
+	<X> 28 </X>
+	<Y> 202 </Y>
+	<Width> 241 </Width>
 	<Height> 72 </Height>
 </Language>
 </Button>
@@ -495,9 +497,9 @@
 </EventClick>
 <Language>
 	<ID> 000010 </ID>
-	<X> 30 </X>
-	<Y> 200 </Y>
-	<Width> 237 </Width>
+	<X> 28 </X>
+	<Y> 202 </Y>
+	<Width> 241 </Width>
 	<Height> 72 </Height>
 </Language>
 </Button>
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index 0da2433c..e861f0fb 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -106,8 +106,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "6.81"
-	Var XMLPageVersionInt = 681
+	Var XMLPageVersion = "6.82"
+	Var XMLPageVersionInt = 682
 </EventOpen>
 
 <Text>