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

inter/tha/.special/RoadShow.ev

@@ -1,5 +1,5 @@
 
-SAVELOG "RoadShow.ev 173950 172303 EFR02 RoadShowBoxID is 2"
+SAVELOG "RoadShow.ev 200559 201876 EFR02 RoadShowBoxID is 1"
 SAVELOG "4 Apr"
 
 
@@ -16,10 +16,10 @@ Var RoadShowBoxID = 0
 If SystemDateYearInt = 2025 Then
 
 	; EFR02
-	If BoxID = 173950 Then
+	If BoxID = 200559 Then
 		Var RoadShowBoxID = 1
 	EndIf
-	If BoxID = 172303 Then
+	If BoxID = 201876 Then
 		Var RoadShowBoxID = 1
 	EndIf
 
@@ -30,10 +30,10 @@ If SystemDateYearInt = 2025 Then
 		
 	EndIf
 	
-	If SystemDateMonthInt = 4 Then
+	If SystemDateMonthInt = 5 Then
 
 		If RoadShowBoxID = 1 Then
-			If SystemDateDayInt = 4 Then
+			If SystemDateDayInt = 14 Then
 				Var RoadShow = "true"
 				Var RoadShowMarketCode = "EFR02"
 				

inter/tha/menu/lang.tsv

@@ -1282,7 +1282,7 @@
 1300016		Brew time:sec	เวลาชง: วินาที
 1300017		Test grind sizes	ทดสอบขนาดบด
 1300018		Coffee module type :	ประเภทชุดกาแฟ :
-1300019		1. Select grind sizes	1. เลือกขนาดการบด
+1300019		1. Select grind sizes	1. เลือกขนาดบด
 1300020		More coarse	หยาบขึ้น
 1300021		More fine	ละเอียดขึ้น
 1300022		2. Test grinding	2. ทดสอบการบด

inter/tha/xml/multi/ForProGroup.inc

@@ -19,3 +19,9 @@
             EndIf
         EndIf
     EndIf
+
+    If Timeout > 60 Then
+        ;include="ROOT/taobin_project/inc/return_condition.ev"
+    EndIf
+
+    Var Timeout = Timeout + 1

inter/tha/xml/multi/control_and_lang_swith.ev

@@ -8,22 +8,22 @@ TRY "ROOT/taobin_project/xml/event/tricker.ev"
 
 SAVELOG "=================== Control language and switch instance ========================="
 
-OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_coffee.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/coffee.ev"
+OpenRedirect "/taobin_project/xml/page_catalog_group_coffee.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/coffee.ev"
 Var InstanceTabOpenFile2 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
 Var InstanceTabOpenFile2 = InstanceTabOpenFile2 + "/page_catalog_group_coffee.lxml"
 
 
-OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_tea.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/tea.ev"
+OpenRedirect "/taobin_project/xml/page_catalog_group_tea.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/tea.ev"
 Var InstanceTabOpenFile3 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
 Var InstanceTabOpenFile3 = InstanceTabOpenFile3 + "/page_catalog_group_tea.lxml"
 
-OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_milk.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/milk.ev"
+OpenRedirect "/taobin_project//xml/page_catalog_group_milk.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/milk.ev"
 Var InstanceTabOpenFile4 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
 Var InstanceTabOpenFile4 = InstanceTabOpenFile4 + "/page_catalog_group_milk.lxml"
 
 DEBUGVAR BoostEnergyPro
 
-OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_other_other.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/otherOther.ev"
+OpenRedirect "/taobin_project//xml/page_catalog_group_other_other.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/otherOther.ev"
 Var InstanceTabOpenFile7 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
 If BoostEnergyPro = 1 Then
     Var InstanceTabOpenFile7 = InstanceTabOpenFile7 + "/event/event_v3/catalog_other/active_promotions.lxml"
@@ -37,51 +37,51 @@ If AppFastButtonState = "Enable" Then
 EndIf
 
 If WheyButtonState = "Enable" Then
-    OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_whey.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev"
+    OpenRedirect "/taobin_project/xml/page_catalog_group_whey.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev"
     Var InstanceTabOpenFile5 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
     Var InstanceTabOpenFile5 = InstanceTabOpenFile5 + "/page_catalog_group_whey.lxml"
 Else
-    OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev"
+    OpenRedirect "/taobin_project/xml/page_catalog_group_forkid.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev"
     Var InstanceTabOpenFile5 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
     Var InstanceTabOpenFile5 = InstanceTabOpenFile5 + "/page_catalog_group_forkid.lxml"
 EndIf
 
 If MenuKidButtonState = "Enable" Then
-    OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev"
+    OpenRedirect "/taobin_project/xml/page_catalog_group_forkid.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev"
     Var InstanceTabOpenFile5 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
     Var InstanceTabOpenFile5 = InstanceTabOpenFile5 + "/page_catalog_group_forkid.lxml"
 EndIf
 
 
 If CocktailShow = "true" Then
-    OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_cocktail.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/health.ev"
+    OpenRedirect "/taobin_project/xml/page_catalog_group_cocktail.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/health.ev"
     Var InstanceTabOpenFile6 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
     Var InstanceTabOpenFile6 = InstanceTabOpenFile6 + "/page_catalog_group_cocktail.lxml"
 Else
-    OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_health.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/health.ev"
+    OpenRedirect "/taobin_project/xml/page_catalog_group_health.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/health.ev"
     Var InstanceTabOpenFile6 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
     Var InstanceTabOpenFile6 = InstanceTabOpenFile6 + "/page_catalog_group_health.lxml"
 EndIf
 
 
-OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_pepsi_7up.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/pepsi7up.ev"
+OpenRedirect "/taobin_project/xml/page_catalog_group_pepsi_7up.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/pepsi7up.ev"
 Var InstanceTabOpenFile8 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
 Var InstanceTabOpenFile8 = InstanceTabOpenFile8 + "/page_catalog_group_pepsi_7up.lxml"
 
 
 
 
-OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_frozen_fruit.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/frozenfruilt.ev"
+OpenRedirect "/taobin_project/xml/page_catalog_group_frozen_fruit.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/frozenfruilt.ev"
 Var InstanceTabOpenFile9 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
 Var InstanceTabOpenFile9 = InstanceTabOpenFile9 + "/page_catalog_group_frozen_fruit.lxml"
 
 
 
 
-Var InstanceTabOpenFile12 = "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
+;Var InstanceTabOpenFile12 = "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
 
 
-Var InstanceTabOpenFile13 = "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
+Var InstanceTabOpenFile15 = "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
 
 TabMenuVisibleInst 99
 

inter/tha/xml/multi/page_catalog.lxml

@@ -679,12 +679,11 @@
 
 	<EventClick>
 
-		Var OpenFromMulti = 1
+		 Var OpenFromMulti = 0
+            Var OpenFromPageBoard = 1
 
-		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev"
+            TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev"
 
-		RootLayoutVisible 3 "hide"
-		RootLayoutVisible 13 "hide"
 
 	</EventClick>
 	<Language>

inter/tha/xml/multi/page_instance2.xml

@@ -7,7 +7,7 @@
 
 
     RootLayoutVisible 3 "show"
-    RootLayoutVisible 13 "show"
+    RootLayoutVisible 15 "show"
 
     OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
 

inter/tha/xml/multi/tab_menu.lxml

@@ -97,12 +97,10 @@
         <EventClick>
             SAVELOG "Click rec"
             Var NextPage = "-"
-            Var OpenFromMulti = 1
+            Var OpenFromMulti = 0
             Var OpenFromPageBoard = 1
 
-
+            TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev"
-
-            TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev"
 
 
         </EventClick>

inter/tha/xml/multi/tab_menu_hide.lxml

@@ -1 +1 @@
-RootLayoutVisible 13 "hide"
+RootLayoutVisible 15 "hide"

inter/tha/xml/multi/tab_menu_show_and_refresh.lxml

@@ -1,3 +1,3 @@
 
-    OpenInst 13 "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
+    OpenInst 15 "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
-    RootLayoutVisible 13 "show"
+    RootLayoutVisible 15 "show"

inter/tha/xml/multi/v3/event/event_v3/2_promotion_school_ovaltine.json

@@ -5,5 +5,5 @@
   "type": "VIDEO",
   "media_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.mp4",
   "media_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.mp4",
-  "event_click": "Open \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_school_ovaltine.lxml\""
+  "event_click": "TabMenuVisibleInst 99\r\nOpenInst 2 \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_school_ovaltine.lxml\""
 }

inter/tha/xml/multi/v3/event/event_v3/3_promotion_oreo_volcano.json

@@ -5,5 +5,5 @@
   "type": "IMAGE",
   "media_thai": "ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png",
   "media_eng": "ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png",
-  "event_click": "Open \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_oreo_volcano.lxml\""
+  "event_click": "TabMenuVisibleInst 99\r\nOpenInst 2 \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_oreo_volcano.lxml\""
 }

inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml

@@ -7,31 +7,26 @@
 ;<Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
-     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
+
-     ; soda and other
+</EventOpen>
+
+<EventOnShow>
+    Var RecommendTimeOut = 0
+
+    ; On open
+	;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
     Var Menu1Selected = "PressForever"
 
 
-    Var RecommendTimeOut = 0
+    SAVELOG PreviseXMLFileName2
     ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
 
-    SetInstanceIgnoreTouch
+    Var Timeout = 0
 
 
     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
 
-    Var OtherOtherRefreshTimeOut = 14
+    RefreshAll
-
-	DEBUGVAR SlientRefreshIndex
-
-    TRY "ROOT/taobin_project/inter/tha/show_lang.ev"
-
-
-    DEBUGVAR NextPage
-</EventOpen>
-
-<EventOnShow>
-
 </EventOnShow>
 
 <Timeout> 1000 </Timeout>
@@ -59,27 +54,6 @@
         EndIf
     EndIf
 
-    If NextPage = "-" Then
-
-    Else
-
-            If CupOnArm = "true" Then
-                If RecommendTimeOut > 9 Then
-                    SAVELOG "COA9"
-                    Var NextPageAlternate = NextPage
-                    Var NextPage = "-"
-                    Open NextPageAlternate
-                EndIf
-            Else
-                If RecommendTimeOut > 30 Then
-                    SAVELOG "COA30"
-                    Var NextPageAlternate = NextPage
-                    Var NextPage = "-"
-                    Open NextPageAlternate
-
-                EndIf
-            EndIf
-    EndIf
     Var RecommendTimeOut = RecommendTimeOut + 1
 
     TimerReset
@@ -160,7 +134,8 @@
 				)
 			</Media>
 			<EventOnClick>
-				Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_school_ovaltine.lxml"
+				TabMenuVisibleInst 99
+OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_school_ovaltine.lxml"
 			</EventOnClick>
 		</Banner>
 		<Banner>
@@ -176,7 +151,8 @@
 				)
 			</Media>
 			<EventOnClick>
-				Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_oreo_volcano.lxml"
+				TabMenuVisibleInst 99
+OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_oreo_volcano.lxml"
 			</EventOnClick>
 		</Banner>
 

inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev

@@ -1,6 +1,14 @@
 
+Var InstanceTabOpenFile10 = "ROOT/taobin_project/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml"
+
+TabMenuVisibleInst 10
+OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
+
+OpenInst 15 "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
+RootLayoutVisible 15 "show"
+
+;Var FileRecommendToOpen = "ROOT/taobin_project/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml"
 
-Var FileRecommendToOpen = "ROOT/taobin_project/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml"
 
 Var MatchaEveryDayProState  = "Invisible"
 Var SchoolOvaltineProState = "Invisible"

inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml

@@ -7,31 +7,26 @@
 ;<Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
-     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
+
-     ; soda and other
+</EventOpen>
+
+<EventOnShow>
+    Var RecommendTimeOut = 0
+
+    ; On open
+	;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
     Var Menu1Selected = "PressForever"
 
 
-    Var RecommendTimeOut = 0
+    SAVELOG PreviseXMLFileName2
     ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
 
-    SetInstanceIgnoreTouch
+    Var Timeout = 0
 
 
     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
 
-    Var OtherOtherRefreshTimeOut = 14
+    RefreshAll
-
-	DEBUGVAR SlientRefreshIndex
-
-    TRY "ROOT/taobin_project/inter/tha/show_lang.ev"
-
-
-    DEBUGVAR NextPage
-</EventOpen>
-
-<EventOnShow>
-
 </EventOnShow>
 
 <Timeout> 1000 </Timeout>
@@ -59,27 +54,6 @@
         EndIf
     EndIf
 
-    If NextPage = "-" Then
-
-    Else
-
-            If CupOnArm = "true" Then
-                If RecommendTimeOut > 9 Then
-                    SAVELOG "COA9"
-                    Var NextPageAlternate = NextPage
-                    Var NextPage = "-"
-                    Open NextPageAlternate
-                EndIf
-            Else
-                If RecommendTimeOut > 30 Then
-                    SAVELOG "COA30"
-                    Var NextPageAlternate = NextPage
-                    Var NextPage = "-"
-                    Open NextPageAlternate
-
-                EndIf
-            EndIf
-    EndIf
     Var RecommendTimeOut = RecommendTimeOut + 1
 
     TimerReset

inter/tha/xml/multi/v3/page_catalog_group_recommend.skt

@@ -9,31 +9,26 @@
 ;<Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
-     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
+
-     ; soda and other
+</EventOpen>
+
+<EventOnShow>
+    Var RecommendTimeOut = 0
+
+    ; On open
+	;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
     Var Menu1Selected = "PressForever"
 
 
-    Var RecommendTimeOut = 0
+    SAVELOG PreviseXMLFileName2
     ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
 
-    SetInstanceIgnoreTouch
+    Var Timeout = 0
 
 
     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
 
-    Var OtherOtherRefreshTimeOut = 14
+    RefreshAll
-
-	DEBUGVAR SlientRefreshIndex
-
-    TRY "ROOT/taobin_project/inter/tha/show_lang.ev"
-
-
-    DEBUGVAR NextPage
-</EventOpen>
-
-<EventOnShow>
-
 </EventOnShow>
 
 <Timeout> 1000 </Timeout>
@@ -61,27 +56,6 @@
         EndIf
     EndIf
 
-    If NextPage = "-" Then
-
-    Else
-
-            If CupOnArm = "true" Then
-                If RecommendTimeOut > 9 Then
-                    SAVELOG "COA9"
-                    Var NextPageAlternate = NextPage
-                    Var NextPage = "-"
-                    Open NextPageAlternate
-                EndIf
-            Else
-                If RecommendTimeOut > 30 Then
-                    SAVELOG "COA30"
-                    Var NextPageAlternate = NextPage
-                    Var NextPage = "-"
-                    Open NextPageAlternate
-
-                EndIf
-            EndIf
-    EndIf
     Var RecommendTimeOut = RecommendTimeOut + 1
 
     TimerReset

ui/lang.tsv

@@ -1282,7 +1282,7 @@
 1300016		Brew time:sec	เวลาชง: วินาที
 1300017		Test grind sizes	ทดสอบขนาดบด
 1300018		Coffee module type :	ประเภทชุดกาแฟ :
-1300019		1. Select grind sizes	1. เลือกขนาดการบด
+1300019		1. Select grind sizes	1. เลือกขนาดบด
 1300020		More coarse	หยาบขึ้น
 1300021		More fine	ละเอียดขึ้น
 1300022		2. Test grinding	2. ทดสอบการบด

xml/event/script_common_for_open_promotion_xml.ev

@@ -56,26 +56,27 @@ Else
 
 	EndIf
 
+	DEBUGVAR OpenFromMulti
 	If CatalogLayoutV3 = 1 Then
 
-DEBUGVAR NextPage
 
 		SAVELOG " CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3"
 		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev"
-	EndIf
-
-
-	If OpenFromPageBoard = 1 Then
-
-		DEBUGVAR BigButtonEnable
-
-		OpenInst 2 FileRecommendToOpen
-		Var OpenFromPageBoard = 0
-
 	Else
 	
-		Open FileRecommendToOpen
 
+		If OpenFromPageBoard = 1 Then
+
+			DEBUGVAR BigButtonEnable
+
+			OpenInst 2 FileRecommendToOpen
+			Var OpenFromPageBoard = 0
+
+		Else
+
+			Open FileRecommendToOpen
+
+		EndIf
 	EndIf
 EndIf
 Var OpenFromPageBoard = 0

xml/page_board.xml

@@ -1706,7 +1706,7 @@
 
 	Machine NewPaymentOpenBrewingXMLEnable
 
-	;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+	
 
 	If EnablePepsiFullscreen = 1 Then
 	    DEBUGVAR EnablePepsiFullscreen
@@ -1888,6 +1888,7 @@ PRICE "Reset" "-"
 
 <Timeout> 1000 </Timeout>
 <EventTimeout>
+	
 	;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
 
 	If CNTDOWN_PROTECT_SCREEN_BLANK > 0 Then
@@ -2120,10 +2121,13 @@ PRICE "Reset" "-"
 				DEBUGVAR InternationalEnable
 				DEBUGVAR CountryName
 
+				Var BaseOnPageBoard = 0
+				
 				If CurrHelpCenter = 1 Then
 					; do not thing when open the helper
 				Else
 					Var BaseOnPageBoard = 0
+					TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
 					
 					If InternationalEnable = 1 Then
 						If CountryName = "Thailand" Then
@@ -2135,6 +2139,7 @@ PRICE "Reset" "-"
 							RootLayoutVisible 3 "show"
 
 
+
 							Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev"
 							TRY OpenFileXML
 						EndIf
@@ -2151,9 +2156,7 @@ PRICE "Reset" "-"
 
 					TopView "show"
 					OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
-
 				EndIf
-
 			EndIf
 		EndIf
 
@@ -2166,11 +2169,11 @@ PRICE "Reset" "-"
 		Var CountUpReloadAll = CountUpReloadAll + 1
 
 		DEBUGVAR CountUpReloadAll
-		; setvarint CountUpReloadAll 49
+		; setvarint CountUpReloadAll 200
 		; Original value is 40
 		If EnableMultiInstance = "true" Then
 
-			If CountUpReloadAll > 120 Then
+			If CountUpReloadAll > 50 Then
 				Var NeedReboot = "false"
 
 				Var StartUpExt = "-"
@@ -2631,7 +2634,6 @@ PRICE "Reset" "-"
 		TopView "show"
 		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
 	EndIf
-
 </EventClick>
 </Button>
 

xml/start_up_inst_11.xml

@@ -3,7 +3,6 @@
 <Height> 1920 </Height>
 
 <EventOpen>
-	Var InstanceTabOpenFile11 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.xml"
 
 </EventOpen>
 <Timeout> 10000 </Timeout>

xml/start_up_inst_12.xml

@@ -3,7 +3,6 @@
 <Height> 1920 </Height>
 
 <EventOpen>
-	Var InstanceTabOpenFile12 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.xml"
 
 </EventOpen>
 <Timeout> 10000 </Timeout>

xml/start_up_inst_13.xml

@@ -3,7 +3,6 @@
 <Height> 1920 </Height>
 
 <EventOpen>
-	Var InstanceTabOpenFile13 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.xml"
 
 </EventOpen>
 <Timeout> 10000 </Timeout>

xml/start_up_inst_14.xml

@@ -3,7 +3,6 @@
 <Height> 1920 </Height>
 
 <EventOpen>
-	Var InstanceTabOpenFile14 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.xml"
 
 </EventOpen>
 <Timeout> 10000 </Timeout>

xml_main/startup.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "9.89"
+	Var XMLPageVersion = "9.90"
-	Var XMLPageVersionInt = 989
+	Var XMLPageVersionInt = 990
 	
 	Var CurrentMainVideo = 2
 </EventOpen>

xml_main/startup_dev.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "10.89"
+	Var XMLPageVersion = "10.90"
-	Var XMLPageVersionInt = 1089
+	Var XMLPageVersionInt = 1090
 ;Oreo
 Var OreoGuarantee = 0