DO

spiral/xml/page_catalog_vending_machine.xml

@@ -42,11 +42,6 @@
 
     EndIf
 
-<<<<<<< HEAD
-    
-=======
-
->>>>>>> 468c53161bb4d71d849f4f80141a2e7fc2af00de
     ; SpiralOnline
   
         Var MenuVSelected2 = "Invisible"
@@ -65,15 +60,9 @@
 
         Var MenuVSelected2 = "Invisible"
         If SpiralOnline = "true" Then 
-<<<<<<< HEAD
             If Seeker =  "curr" Then
                 Var MenuVSelected2 = "Enable"
             EndIf
-=======
-            If  Seeker = "curr" Then 
-            	Var MenuVSelected2 = "Enable"
-			EndIf
->>>>>>> 468c53161bb4d71d849f4f80141a2e7fc2af00de
         EndIf 
         
         ; init default
@@ -230,11 +219,7 @@
 
 ;
 
-<<<<<<< HEAD
 ;
-=======
->>>>>>> 468c53161bb4d71d849f4f80141a2e7fc2af00de
-
 <ListView1>
     <Width> 1080 </Width>
     <Height> "auto" </Height>   

xml/page_board.xml

@@ -192,12 +192,36 @@
 		Var VideoMainPage = "ROOT/taobin_project/video/main_page.mp4"
 
 		DEBUGVAR SystemDateMonth
-		
+		DEBUGVAR SystemDateDay
-		Var EventTurnOn = 1
+		Var EventTurnOn = 0
-		Var ShowButtonClickFull = "Invisible"
+
-		Var CountDownShowButton = 0
+		If SystemDateMonth = 10 Then
-		Var VideoMainPage = "ROOT/taobin_project/video/main_page_event.mp4"
+
-	
+			Var EventTurnOn = 1
+
+		EndIf
+
+		DEBUGVAR EventTurnOn
+
+		If SystemDateMonth = 11 Then
+			If SystemDateDay > 1 Then
+				Var EventTurnOn = 2
+			EndIf
+		EndIf
+
+
+
+		If EventTurnOn = 1 Then 
+			Var ShowButtonClickFull = "Invisible"
+			Var CountDownShowButton = 0
+			Var VideoMainPage = "ROOT/taobin_project/video/main_page_event.mp4"
+		EndIf
+		If EventTurnOn = 2 Then 
+			Var ShowButtonClickFull = "Invisible"
+			Var CountDownShowButton = 0
+			Var VideoMainPage = "ROOT/taobin_project/video/main_page_event_alter.mp4"
+		EndIf
+
 	EndIf
 	If TermTemOnline = "true" Then
 		Var CountDownShowButton = 28

xml/page_catalog_with_vending.xml

@@ -406,7 +406,7 @@
 <Button>
 <X> 736 </X>
 <Y> 1532 </Y>
-<State>"Enable"</State>
+<State>"Pressforever"</State>
 <Filename> Var(DirImage + "/bn_HealthyOption.png") </Filename>
 <FilenamePress> Var(DirImage + "/bp_HealthyOption.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>

xml/page_thankyou.xml

@@ -145,6 +145,9 @@
 		If EventTurnOn = 1 Then
 			Var video_file_name = "ROOT/taobin_project/video/taobin_thank1_event.mp4"
 		EndIf
+		If EventTurnOn = 2 Then
+			Var video_file_name = "ROOT/taobin_project/video/taobin_thank1_event_alter.mp4"
+		EndIf
 	EndIf