after merge Release taobin 1.24

xml/page_board.xml

@@ -107,15 +107,12 @@
 	
 	StopLongPlay
 
-<<<<<<< HEAD
 
 	Var TimerFirst = "true"
 
 	; TODO: remove when release
 	;Var IgnoreNetCore = "true"
 
-=======
->>>>>>> 546c45f9efeb4082632779505569a6c9da59fbde
 </EventOpen>
 
 <Timeout> 1000 </Timeout>
@@ -243,11 +240,7 @@
 <Video>
 <X> 0 </X>
 <Y> 0 </Y>
-<<<<<<< HEAD
 ;<Loop>"true"</Loop>
-=======
-<Loop>"true"</Loop>
->>>>>>> 546c45f9efeb4082632779505569a6c9da59fbde
 ;<Volume> 80 </Volume>
 <Filename> "ROOT/taobin_project/video/main_page.mp4" </Filename>
 </Video>
@@ -309,11 +302,7 @@
 <EventClick> 
 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
-<<<<<<< HEAD
-	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_memeber.xml"
-=======
 	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_member.xml"
->>>>>>> 546c45f9efeb4082632779505569a6c9da59fbde
 	
 	TopView "show"
 	Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"

xml/page_brewing3.xml

@@ -97,10 +97,6 @@
 		Open "ROOT/taobin_project/xml/page_drinkok.xml" 
 	EndIf
 
-<<<<<<< HEAD
-=======
-
->>>>>>> 546c45f9efeb4082632779505569a6c9da59fbde
 </EventActionOk>
 
 <EventActionError>
@@ -348,27 +344,7 @@
 					Else
 						Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
 					EndIf
-<<<<<<< HEAD
-				EndIf
 
-				
-			Else
-				If ChangeFlag2 = 1 Then
-					Var TelephoneNumber = "0899999999"
-					Var VendingDiscount = 0
-					Var VendingCampaign = 0
-					Var ServiceType = "credit"
-					Var SessionID2 = SelectDrink
-					Var ServiceCredit = "coffee"
-					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
-				Else
-						;no wait ack pay
-						Var waitAckPay = 0 
-				EndIf
-				
-			EndIf
-
-=======
 				EndIf
 
 			
@@ -405,7 +381,7 @@
 				EndIf
 				
 			EndIf
->>>>>>> 546c45f9efeb4082632779505569a6c9da59fbde
+			
 		EndIf
 
 		Var ServiceSuccess = "yes"

xml/page_collect_point_3.xml

@@ -39,6 +39,7 @@
 	EndIf
 
 	
+	
 	Var pImage = CoffeePointTmp * 20
 	Var pImage = pImage / 30
 	Var pImageStr = "/taobinP"