release 5.90

xml/page_board.xml

@@ -219,7 +219,7 @@
 
 	LED LedDoorLid Off 255 255 255 255
 
-	DEBUGVAR AdvertiseProfile
+
 
 	SPLIT   AdvertiseProfile    "/"   1   AdvertiseProfile1
 	SPLIT   AdvertiseProfile    "/"   2   AdvertiseProfile2
@@ -371,6 +371,25 @@
 	
 	Machine CancelWepApp
 
+
+	;StrLen AdvertiseProfile AdvertiseProfileLen
+	;
+	;If AdvertiseProfileLen = 0 Then
+	;	CacheVarStr "get" AdvertiseProfile
+	;Else
+	;
+	;	STRCONTAIN "00/00" AdvertiseProfile advPro
+	;	
+	;	If advPro = "true" Then
+	;		CacheVarStr "get" AdvertiseProfile
+	;	Else
+	;		CacheVarStr "put" AdvertiseProfile
+	;	EndIf
+	;EndIf
+
+	DEBUGVAR AdvertiseProfile
+
+
 </EventOpen>
 
 <Timeout> 1000 </Timeout>

xml/page_payment.xml

@@ -71,6 +71,9 @@
 
 	SAVELOG MachineStage
 
+
+	READ_FILE "/mnt/sdcard/can_sell" ReadyForBrew
+
 	If ReadyForBrew = "false" Then
 		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
 		Var ReadyForBrew = "false"

xml/page_topping_select.xml

@@ -12,6 +12,7 @@
 	
 	DEBUGVAR EnableSelectMenuBetweenBrew
 	
+	
 	If JXMLVersionInt >= 369 Then
 		If EnableSelectMenuBetweenBrew = "Enable" Then
 			Open "ROOT/taobin_project/xml/page_topping_select4.xml"

xml/page_topping_select4.xml

@@ -13,6 +13,14 @@
 
 	DEBUGVAR SelectDrink
 	DEBUGVAR PictureDrink
+
+	If SelectDrinkLen = 0 Then
+		Open "ROOT/taobin_project/xml/page_catalog.xml"
+	EndIf
+
+	If PriceDrink = 0 Then
+		Open "ROOT/taobin_project/xml/page_catalog.xml"
+	EndIf
 	
 	Var SaveProductCodeSelect = SelectDrink
 	Var UserSelectProductCode = SelectDrink
@@ -641,6 +649,23 @@
 			Refresh
 		EndIf
 
+		If TOPPING2 = "add-show-1009" Then
+	
+			Var ShotCoffeePremium = "Enable"
+			Var showShotEnable = "Enable"
+
+			DEBUGVAR TOPPING2
+			Refresh
+		EndIf
+		If TOPPING2 = "add-show-1101" Then
+	
+			Var ShotCoffeePremium = "Enable"
+			Var showShotEnable = "Enable"
+
+			DEBUGVAR TOPPING2
+			Refresh
+		EndIf
+
 ;-END
 		If TOPPING3 = "Collagen" Then
 			Var CollagenState = "Enable"
@@ -1530,8 +1555,12 @@
 
 	;Var Seeker = "curr"
 
-
+	DEBUGVAR PriceDrinkTmp
-	Var Seeker.PriceDrink = PriceDrinkTmp
+	
+	;Var Seeker.PriceDrink = PriceDrinkTmp
+	
+	Var PriceDrink = PriceDrinkTmp
+	
 	SAVELOG "USER press next ( topping ) - new"
 
 	Var Seeker.topping1 = topping1

xml/video_loop2.xml

@@ -12,7 +12,7 @@
 	Var ClickCountMainTe = 0
 </EventOpen>
 
-<Timeout> 20000 </Timeout>
+<Timeout> 33000 </Timeout>
 <EventTimeout> 
 	Var AdvImageFile = "/mnt/sdcard/coffeevending/taobin_project/image/adv_img_"
 	Var AdvImageFile = AdvImageFile + FileNumber

xml_main/startup.xml

@@ -95,8 +95,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "5.89"
+	Var XMLPageVersion = "5.90"
-	Var XMLPageVersionInt = 589
+	Var XMLPageVersionInt = 590
 </EventOpen>
 
 <Text>