Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

inc/button_lang.inc

@@ -0,0 +1,31 @@
+<Button>
+<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> 
+	SAVELOG "Lang click"
+	DEBUGVAR show_lang
+	
+	If show_lang = "THAI" Then
+		Var show_lang = "ENG"
+	Else
+		If show_lang = "ENG" Then
+			Var show_lang = "THAI"
+		Else
+			Var show_lang = "THAI"
+		EndIf
+	EndIf
+
+
+	CALL "EventLanguageChange"
+
+
+	;Open CurrentXMLFileName2
+
+	
+</EventClick>
+</Button>
+

xml/page_advert2.xml

@@ -8,7 +8,7 @@
 <Width> 1080</Width>
 <Height> 380 </Height>
 <Loop> "true" </Loop>
-<Filename> video_menu_1 </Filename>
+<Filename> video_menu2_1 </Filename>
 
 </Video>
 

xml/page_board.xml

@@ -36,7 +36,8 @@
 	Var web_readyOK = "false"
 
 	Var GetFreeFromError = 0
-	Var taobin_version = "2.03"
+	Var taobin_version = "1.00"
+
 	
 	Cart "DeleteMenuID" "ALL"
 	Var MultiPayEnable = "false"
@@ -296,6 +297,8 @@
 		Var video_main_4 = video_main_4 + ".mp4"
 		Var video_main_5 = AdvTaobinHome + AdvertiseProfile12
 		Var video_main_5 = video_main_5 + ".mp4"	
+		Var video_main_5 = AdvTaobinHome + AdvertiseProfile13
+		Var video_main_6 = video_main_6 + ".mp4"	
 
 	If AdvertiseProfile7 = "00" Then
 		Var video_main_count = 1
@@ -347,31 +350,43 @@
 		Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile12
 		Var video_menu_0 = video_menu_0 + ".mp4"
 	EndIf
+	If VideoAdvIndex = 6 Then
+		Var video_menu_0 = AdvTaobinMenu + AdvertiseProfile13
+		Var video_menu_0 = video_menu_0 + ".mp4"
+	EndIf
 
 	If VideoAdvIndex = 0 Then
-		Var video_menu_1 = AdvTaobinMenu2 + AdvertiseProfile7
+		Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile7
-		Var video_menu_1 = video_menu_1 + ".mp4"
+		Var video_menu2_1 = video_menu2_1 + ".mp4"
 	EndIf
 	If VideoAdvIndex = 1 Then
-		Var video_menu_1 = AdvTaobinMenu2 + AdvertiseProfile8
+		Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile8
-		Var video_menu_1 = video_menu_1 + ".mp4"
+		Var video_menu2_1 = video_menu2_1 + ".mp4"
 	EndIf
 	If VideoAdvIndex = 2 Then
-		Var video_menu_1 = AdvTaobinMenu2 + AdvertiseProfile9
+		Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile9
-		Var video_menu_1 = video_menu_1 + ".mp4"
+		Var video_menu2_1 = video_menu2_1 + ".mp4"
 	EndIf
 	If VideoAdvIndex = 3 Then
-		Var video_menu_1 = AdvTaobinMenu2 + AdvertiseProfile10
+		Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile10
-		Var video_menu_1 = video_menu_1 + ".mp4"
+		Var video_menu2_1 = video_menu2_1 + ".mp4"
 	EndIf
 	If VideoAdvIndex = 4 Then
-		Var video_menu_1 = AdvTaobinMenu2 + AdvertiseProfile11
+		Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile11
-		Var video_menu_1 = video_menu_1 + ".mp4"
+		Var video_menu2_1 = video_menu2_1 + ".mp4"
 	EndIf
 	If VideoAdvIndex = 5 Then
-		Var video_menu_1 = AdvTaobinMenu2 + AdvertiseProfile12
+		Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile12
-		Var video_menu_1 = video_menu_1 + ".mp4"
+		Var video_menu2_1 = video_menu2_1 + ".mp4"
 	EndIf
+	If VideoAdvIndex = 6 Then
+		Var video_menu2_1 = AdvTaobinMenu2 + AdvertiseProfile13
+		Var video_menu2_1 = video_menu2_1 + ".mp4"
+	EndIf
+	
+
+	DEBUGVAR video_menu2_1
+
 
 
 	
@@ -453,6 +468,8 @@
 		;Var new_layout = "false"
 	EndIf
 
+	Var show_lang = "THAI"
+
 </EventOpen>
 
 <Timeout> 1000 </Timeout>
@@ -534,7 +551,7 @@
 
 				Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
 
-				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 				If new_layout = "true" Then
 			    	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.xml"
 				Else
@@ -841,6 +858,17 @@
 <Color> "0xFF0000" </Color>
 <Width> 1080 </Width>
 <Height> 60 </Height>
+<EventClick> 
+	
+	Var NextPage = "-"
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+
+	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog2.xml"
+
+
+	TopView "show"
+	Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
+</EventClick>
 </Button>
 
 <Text>

xml/page_catalog2.xml

@@ -0,0 +1,540 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+	
+	TopView "show"
+	; On open
+
+	Var NextPage = "-"
+
+	Var Seeker.thankLidFlag = 0
+	Var Seeker.thankStrawFlag = 0
+
+	WEB "DISABLE"
+
+	Var web_readyOK = "false"
+	Var web_telnumOK = ""
+
+	Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/"
+	
+	If CocktailShow = "true" Then 
+		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"	
+	EndIf
+	
+	If TermTemOnline = "true" Then
+		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_tt_catalog.xml"
+	EndIf
+	 	
+	;Machine DoorLidClose
+
+	Var GetPayInfoFlag = 0
+	Var countDownRetrun = 30
+
+	CoinVending OFF
+
+	
+	; Clear value
+	Topping "clear" "-"
+
+	
+
+
+	Var StrawAutoRelease1 = "false"
+	Var StrawAutoRelease2 = "false"
+
+
+	If NetworkStatus = "ACTIVATE" Then
+		Var ShowButtonClick2 = "Enable"
+	Else
+		Var ShowButtonClick2 = "Invisible"
+		Var ButtontoTopupMenu = "Invisible"
+	EndIf
+
+	If NetworkStatus = "ACTIVATE" Then
+		Var ShowNetworkProblem = "Invisible"
+		Var ShowNetworkProblemText = ""
+
+		;GenHashWithTimeStamp QRCODE99x
+		WEB "ENABLE"
+		
+	Else
+		Var ShowNetworkProblem = "Enable"
+		Var ShowButtonClick2 = "Invisible"
+		Var ButtontoTopupMenu = "Invisible"
+		Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
+
+		Var QRCODE99 = ""
+		WEB "DISABLE"
+
+	EndIf
+
+	; 1035 is Coke.
+	STRCONTAIN "1035" MaterialAvailable CokeUI 
+
+	Var bnSodaAndOther = DirImage + "/bn_soda_coke.png"
+	Var bpSodaAndOther = DirImage + "/bp_soda_coke.png"
+
+
+	Var countClick = 0
+
+
+	DEBUGVAR CART_COUNT
+
+
+	Var QRCODE99_Y = 1718
+
+    Var showCart = "Invisible"
+    If MultiPayEnable = "true" Then 
+	    
+	    If CART_COUNT = 1 Then
+	        Var showCart = "Enable"
+	  		Var cart_image_bn = DirImageCart + "/bn_cart1.png"
+	    	Var cart_image_bp = DirImageCart + "/bp_cart1.png"
+
+			Var QRCODE99_Y = 1580
+
+	    EndIf
+	    
+	    If CART_COUNT = 2 Then
+	        Var showCart = "Enable"
+	    	Var cart_image_bn = DirImageCart + "/bn_cart2.png"
+	    	Var cart_image_bp = DirImageCart + "/bp_cart2.png"
+
+			Var QRCODE99_Y = 1580
+
+	    EndIf
+
+    
+
+	    If CART_COUNT = 3 Then
+	    		Open "ROOT/taobin_project/xml/page_payment_multi.xml"
+	    EndIf
+
+    EndIf
+
+	If Seeker = "next" Then
+		Var ShowButtonClick2 = "Invisible"
+		Var ButtontoTopupMenu = "Invisible"
+	EndIf
+
+
+	If XMLProfile = "taobin_notopup" Then
+		Var ButtontoTopupMenu = "Disable"
+	
+	EndIf
+
+	
+	Var menu_name_eng_hot = ""
+	Var menu_desc_eng_hot = ""
+	Var menu_name_thai_hot = ""
+	Var menu_desc_thai_hot = ""
+
+	Var menu_name_eng_cold = ""
+	Var menu_desc_eng_cold = ""
+	Var menu_name_thai_cold = ""
+	Var menu_desc_thai_cold = ""
+
+
+	Var menu_name_eng_blender = ""
+	Var menu_desc_eng_blender = ""
+	Var menu_name_thai_blender = ""
+	Var menu_desc_thai_blender = ""
+
+
+	
+	
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+
+	;SAVELOG SoundPlaying
+
+	If countDownRetrun > 0 Then
+		Var countDownRetrun = countDownRetrun - 1
+	EndIf
+
+	If countDownRetrun = 0 Then
+		 If  Seeker = "next" Then 
+            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+        Else
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        EndIf
+	EndIf
+
+	
+
+	Refresh
+	TimerReset
+</EventTimeout> 
+
+
+<EventWebApp>
+
+	DEBUGVAR web_ready
+	If web_ready = "true" Then
+		If web_ref = QRCODE99 Then
+			Cart "DeleteMenuID" "ALL"
+			Var web_readyOK = web_ready
+			Var web_telnumOK = web_telnum
+		
+
+		
+			Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+		EndIf
+		
+	Else
+	EndIf
+ 
+</EventWebApp>
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<Width> 1080 </Width>
+<Height> 1540 </Height>
+<Color> "0xeae6e1" </Color>
+</Image>
+
+
+
+;<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>
+<Y> 420 </Y>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	If  Seeker = "next" Then 
+        Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+    Else
+        Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+    EndIf
+</EventClick>
+</Button>
+
+
+
+
+;include=ROOT/taobin_project/inc/button_lang.inc
+
+
+<EventLanguageChange>
+	DEBUGVAR show_lang
+
+	If show_lang = "ENG" Then 
+		Var DirImage = "ROOT/taobin_project/image/page2_en/page2"
+		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3"
+		Play PlaySoundLag
+
+		Var DirImageCart = "ROOT/taobin_project/image/cart_en"
+	EndIf
+
+	If show_lang = "THAI" Then
+		Var DirImage = "ROOT/taobin_project/image/page2"
+		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"
+		Play PlaySoundLag
+
+		Var DirImageCart = "ROOT/taobin_project/image/cart_th"
+	EndIf
+
+	Var bnSodaAndOther = DirImage + "/bn_soda_coke.png"
+	Var bpSodaAndOther = DirImage + "/bp_soda_coke.png"
+
+	RefreshAll
+	
+</EventLanguageChange>
+
+<Image>
+<X> 70 </X>
+<Y> 583 </Y>
+<Filename> Var(DirImage + "/text1.png")  </Filename>
+</Image>
+
+
+
+; menu row 1
+<Button>
+<X> 205 </X>
+<Y> 849 </Y>
+<Filename> Var(DirImage + "/bn_diy.png")   </Filename>
+<FilenamePress> Var(DirImage + "/bp_diy.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"
+	
+	; 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	
+</EventClick>
+</Button>
+
+<Button>
+<X> 579 </X>
+<Y> 849 </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
+</EventClick>
+</Button>
+
+; menu row 2
+<Button>
+<X> 205 </X>
+<Y> 1191 </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
+</EventClick>
+</Button>
+
+<Button>
+<X> 579 </X>
+<Y> 1191 </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" 
+
+	EndIf
+</EventClick>
+</Button>
+
+
+
+<Button>
+<X> 205 </X>
+<Y> 1533 </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"
+	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
+</EventClick>
+</Button>
+
+<Button>
+<X> 205 </X>
+<Y> 1533 </Y>
+<State>AppFastButtonState</State>
+<Filename> Var(DirImage + "/bn_appfast.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_appfast.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_appfast.xml" 
+	Else
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
+	EndIf
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 579 </X>
+<Y> 1533 </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
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 225 </X>
+<Y> 424 </Y>
+<State> ShowButtonClick2 </State>
+<Filename>  Var(DirImage + "/bn_main_page_member.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_main_page_member.png")  </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; eng
+	Open "ROOT/taobin_project/xml/page_check_member.xml" 
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 696 </X>
+<Y> 424 </Y>
+<State> ButtontoTopupMenu </State>
+<Filename> Var(DirImage + "/bn_main_page_topup.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_main_page_topup.png") </FilenamePress>
+<FilenameDisable> Var(DirImage + "/bp_main_page_topup.png") </FilenameDisable>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; eng
+	Var PayDetail=""
+	Open "ROOT/taobin_project/xml/page_back_to_topup.xml" 
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 0 </X>
+<Y> 1870 </Y>
+<State> ShowNetworkProblem </State>
+<Color> "0xFF0000" </Color>
+<Width> 1080 </Width>
+<Height> 60 </Height>
+</Button>
+
+<Text>
+<X> 5 </X>
+<Y> 1880 </Y>
+<Size> 24 </Size>
+<Align> Center </Align>
+<Width> 1080 </Width>
+<Font> RobotoRegular </Font>
+<Color> 0xFFFFFF </Color>
+<Value> ShowNetworkProblemText </Value>
+</Text>
+
+<Button>
+<X> 0 </X>
+<Y> 1860 </Y>
+<Width> 200 </Width>
+<Height> 50 </Height>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var countClick = countClick + 1
+	If countClick = 3 Then
+
+		;Var TestLoopMakeDrink = 1
+
+	EndIf
+	DEBUGVAR countClick
+
+	If countClick = 5 Then
+		If ToppingNewEnable = "false" Then
+			Var ToppingNewEnable = "true"
+		Else
+			Var ToppingNewEnable = "false"
+		EndIf
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
+	EndIf
+
+	Refresh
+</EventClick>
+</Button>
+
+;<QRCode>
+;<X> 895 </X>
+;<Y> QRCODE99_Y</Y>
+;<Width> 178 </Width>
+;<Height> 178 </Height>
+;<State> "Enable" </State>
+;<Service> testservice </Service>
+;</QRCode>
+
+
+
+; Cart
+<Button>
+<X> 915 </X>
+<Y> 1769 </Y>
+<State> showCart </State>
+<Filename> cart_image_bn  </Filename>
+<Filename> cart_image_bp  </Filename>
+<FilenamePress> cart_image_bp </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<Interval> 400</Interval>
+<EventClick> 
+
+		
+	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
+		
+	
+</EventClick>
+</Button>
+
+<EventWebApp>
+
+	DEBUGVAR web_ready
+	If web_ready = "true" Then
+		If web_ref = QRCODE99x Then
+
+			Var web_readyOK = web_ready
+			Var web_telnumOK = web_telnum
+			
+			Var web_app_prepar = "true"
+
+			Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+
+		EndIf
+	Else
+	EndIf
+ 
+</EventWebApp>
+
+
+
+</Popup>

xml/page_catalog_group_milk.xml

@@ -2066,7 +2066,7 @@ MILK" </Value>
 		Var NameDrink = "STRAWCOCOA  SMOOTHIE"
 		Var NameDrinkTH = "โกโก้สตอเบอร์รี่ปั่น"
 		Var DrinkDescriptionTH = "นม น้ำเชื่อมสตอเบอร์รี่  โกโก้ และน้ำแข็ง"
-		Var DrinkDescription = "Milk, Mango Syrup"
+		Var DrinkDescription = "Milk, Strawberry Syrup"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberrycocoa_smoothie.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -2167,7 +2167,7 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Milk, Mango Syrup" </Value>
+	<Value> "Milk, Strawberry Syrup" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>

xml/page_catalog_group_recommend.xml

@@ -7355,7 +7355,7 @@ SMOOTHIE" </Value>
 		Var NameDrink = "STRAWCOCOA  SMOOTHIE"
 		Var NameDrinkTH = "โกโก้สตอเบอร์รี่ปั่น"
 		Var DrinkDescriptionTH = "นม น้ำเชื่อมสตอเบอร์รี่  โกโก้ และน้ำแข็ง"
-		Var DrinkDescription = "Milk, Mango Syrup"
+		Var DrinkDescription = "Milk, Strawberry Syrup"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberrycocoa_smoothie.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -7456,7 +7456,7 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Milk, Mango Syrup" </Value>
+	<Value> "Milk, Strawberry Syrup" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>

xml/page_drinkok.xml

@@ -10,6 +10,7 @@
 	DEBUGVAR LidState
 
 	Var buttonRemoveCup = "Invisible"
+	Var TextBottomShow "Enable"
 			
 	If show_eng = "true" Then 
 		Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
@@ -472,6 +473,13 @@
 	EndIf
 
 
+	If buttonRemoveCup = "Enable" Then
+		Var TextBottomShow = "Invisible"
+	Else
+		Var TextBottomShow = "Enable"
+	EndIf
+
+
 
 	TimerReset
 	Refresh
@@ -522,6 +530,7 @@
 <Image>
 <X> 0 </X>
 <Y> 1418 </Y>
+<State> TextBottomShow </State>
 <Filename> Var( DirImage + "text_bottom.png") </Filename>
 </Image>
 

xml/page_topping_select4.xml

@@ -276,6 +276,8 @@
 
 	Var StrawState = "Enable"
 	Var LidState = "Enable"
+	Var MAT_ID_9701 = StrawState
+	
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 

xml_main/startup.xml

@@ -95,8 +95,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "6.36"
+	Var XMLPageVersion = "6.52"
-	Var XMLPageVersionInt = 636
+	Var XMLPageVersionInt = 652
 </EventOpen>
 
 <Text>

xml_main/startup.xml_561

@@ -0,0 +1,154 @@
+<BeginX>28</BeginX>
+<BeginY>255</BeginY>
+<OverrideBackground> "ROOT/ui/bg_main_menu2.png"</OverrideBackground>
+<Page>
+
+<Width> 1024 </Width>
+<Height> 600 </Height>
+<Background> "/ROOT/pictures/startup.bmp" </Background>
+<Timeout> 3000 </Timeout>
+<EventTimeout> 
+	Open "/ROOT/xml/main.xml" 
+</EventTimeout>
+<EventOpen>
+	Var video_main_0 = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_00.mp4"
+	Var video_menu_0 = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_00.mp4"
+	Var video_menu_1 = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu2_00.mp4"
+	Var MenuLangTH = 1
+	Var VendingCampaign = 0
+	Var VendingDiscount = 0
+	Var VendingClass = ""
+	TopView "hide"
+	Var NetworkStatus = "DOWN"
+	Var MachineErrorDetail = ""
+	Var SetVideo = 1
+	Var AdvSoundWorking  = ""
+	Var AdvSoundWorking = "/ROOT/sounds/adv_working_01.wav"
+	Var AdvIndex = 1
+	Var SetSoundPlay = 0
+	Var CheckAutoZero = 0.0
+	Var DeffZero = 0.0
+	Var CountZero = 0
+	Var AdvWorking = ""
+	Var AdvCoin = ""
+	Var AdvAmount = ""
+	Var AdvMobile = ""
+	Var AdvId = "00"
+	;Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
+	Var AdvertiseProfile1 = "00"
+	Var AdvertiseProfile2 = "00"
+	Var AdvertiseProfile3 = "00"
+	Var AdvertiseProfile4 = "00"
+	Var AdvertiseProfile5 = "00"
+	Var AdvertiseProfile6 = "00"
+	Var AdvertiseProfile7 = "00"
+	Var AdvertiseProfile8 = "00"
+	Var AdvertiseProfile9 = "00"
+	Var AdvertiseProfile10 = "00"
+	Var AdvertiseProfile11 = "00"
+	Var AdvertiseProfile12 = "00"
+	Var AdvertiseProfile13 = "00"
+	Var AdvertiseProfile14 = "00"
+	Var AdvertiseProfile15 = "00"
+	Var AdvertiseProfile16 = "00"
+	Var AdvertiseProfile17 = "00"
+	Var AdvertiseProfile18 = "00"
+	
+	Var ExtSlot1 = ""
+	Var ExtSlot2 = ""
+	Var ExtSlot3 = ""
+	Var ExtSlot4 = ""
+	Var ExtSlot5 = ""
+	Var ExtSlot6 = ""
+	
+	Var AdvExt1 = ".mp4"
+	Var AdvExt2 = ".mp4"
+	Var AdvExt3 = ".mp4"
+	Var AdvExt4 = ".bmp"
+	Var AdvExt5 = ".bmp"
+	Var AdvExt6 = ".bmp"
+	Var AdvExt7 = ".mp4"
+	Var AdvExt8 = ".mp4"
+	Var AdvExt9 = ".bmp"
+	Var AdvExt10 = ".bmp"
+	Var AdvExt11 = ".mp4"
+	Var AdvExt12 = ".bmp"
+	Var AdvExt13 = ".bmp"
+	Var AdvExt14 = ".bmp"
+	Var AdvExt15 = ".bmp"
+	Var AdvExt16 = ".mp4"
+	Var AdvExt17 = ".mp4"
+	Var AdvExt18 = ".bmp"
+	Var AdvExt19 = ".mp4"
+	Var AdvExt20 = ".bmp"
+
+;Dtac		
+	Var RandomPromotion = 0
+;true_move
+	Var RandomPromotion1 = 0
+	Var RandomPromotionAIS = 0
+	Var RandomPromotionCAT = 0
+	Var RandomPromotionOper168 = 0
+	Var RandomPromotionImobile = 0
+	Var RandomPromotionWhitespace = 0
+	Var RandomPromotionTOT = 0
+	Var RandomPromotionMyworld = 0
+	Var RandomSalePackage = 0
+
+	Var XMLPageVersion = "6.51"
+	Var XMLPageVersionInt = 651
+</EventOpen>
+
+<Text>
+	<X> 644 </X>
+	<Y> 350 </Y>
+	<Size> 20 </Size>
+	<Font> fontType1 </Font>
+	<Color> 0xEA068A </Color>
+	<Transparent> 0 </Transparent>
+	<Value> "Engine" </Value>
+</Text>
+
+<Text>
+	<X> 724 </X>
+	<Y> 350 </Y>
+	<Size> 20 </Size>
+	<Font> fontType1 </Font>
+	<Color> 0xEA068A </Color>
+	<Transparent> 0 </Transparent>
+	<Value> SoftwareVersion </Value>
+</Text>
+
+<Text>
+	<X> 628 </X>
+	<Y> 380 </Y>
+	<Size> 20 </Size>
+	<Font> fontType1 </Font>
+	<Color> 0xEA068A </Color>
+	<Transparent> 0 </Transparent>
+	<Value> "Software version" </Value>
+</Text>
+
+<Text>
+	<X> 802 </X>
+	<Y> 380 </Y>
+	<Size> 20 </Size>
+	<Font> fontType1 </Font>
+	<Color> 0xEA068A </Color>
+	<Transparent> 0 </Transparent>
+	<Value> XMLPageVersion </Value>
+</Text>
+
+<TextRunner>
+	<Visible> False </Visible>
+	<Y> 430 </Y>
+	<Size> 50 </Size>
+	<Size> 20 </Size>
+	<Font> fontType1 </Font>
+	<Repeat> True </Repeat>
+	<Color> 0xFFFF00 </Color>
+	<BgColor> 0x0000A0 </BgColor>
+	<Filename> "/ROOT/text/runner.txt" </Filename>
+</TextRunner>
+
+</Page>