From 24b5f62a7ef8975380ad3ad580577d8a8e0f4a1d Mon Sep 17 00:00:00 2001
From: kong <wanlop@forth.co.th>
Date: Tue, 2 Aug 2022 10:02:31 +0700
Subject: [PATCH] DO

---
 xml/page_topping_select4.xml        |   9 +-
 xml_main/startup.xml                |   4 +-
 xml_main/startup_ignore_netcore.xml | 155 ++++++++++++++++++++++++++++
 3 files changed, 163 insertions(+), 5 deletions(-)
 create mode 100644 xml_main/startup_ignore_netcore.xml

diff --git a/xml/page_topping_select4.xml b/xml/page_topping_select4.xml
index 62bccf6e..b98eae4b 100644
--- a/xml/page_topping_select4.xml
+++ b/xml/page_topping_select4.xml
@@ -2281,9 +2281,12 @@
 		Machine LidOrder	
 		Var LedLidBlink = "true"
 	EndIf
-
-	Var StrawState = "Enable"
-	Var LidState = "Enable"
+	If SelectDrinkType = 0 Then
+		
+	Else
+		Var StrawState = "Enable"
+		Var LidState = "Enable"
+	EndIf
 	; 
 	
 	If RoadShow = "true" Then
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index f651ee80..389fc339 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -95,8 +95,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "6.59"
-	Var XMLPageVersionInt = 659
+	Var XMLPageVersion = "6.58"
+	Var XMLPageVersionInt = 658
 </EventOpen>
 
 <Text>
diff --git a/xml_main/startup_ignore_netcore.xml b/xml_main/startup_ignore_netcore.xml
new file mode 100644
index 00000000..fadeeea1
--- /dev/null
+++ b/xml_main/startup_ignore_netcore.xml
@@ -0,0 +1,155 @@
+<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.58"
+	Var XMLPageVersionInt = 658
+	Var IgnoreNetCore = "true"
+</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>