Merge branch 'master' of forthrd.ddns.net:/1TBHDD/ikong/taobin_project

xml/page_board.xml

@@ -522,6 +522,7 @@
 			Var web_readyOK = web_ready
 			Var web_telnumOK = web_telnum
 			
+			Var web_app_prepar = "true"
 
 			OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
@@ -668,10 +669,21 @@
 <Value> ShowNetworkProblemText </Value>
 </Text>
 
+;<QRCode>
+;<X> 795 </X>
+;<Y> 1010 </Y>
+;<Width> 278 </Width>
+;<Color> "0xeae6e1" </Color>
+;<Height> 278 </Height>
+;<State> WebAppShow </State>
+;<Service> testservice </Service>
+;</QRCode>
+
 <QRCode>
 <X> 895 </X>
 <Y> 1110 </Y>
 <Width> 178 </Width>
+<Color> "0xeae6e1" </Color>
 <Height> 178 </Height>
 <State> WebAppShow </State>
 <Service> testservice </Service>

xml/page_lid_straw.xml

@@ -75,13 +75,12 @@
 
 
 
-	If lidAndStrawOldPageIgnore = "true" Then
+	;If lidAndStrawOldPageIgnore = "true" Then
-		Var lidAndStrawOldPageIgnore = "false"
+	;	Var lidAndStrawOldPageIgnore = "false"
-
+	
-		
 		
 		Open "ROOT/taobin_project/xml/page_brewing3.xml"  
-	EndIf
+	;EndIf
 
 	Var LidState = Lid1Status
 	;Lid1Status

xml/page_payment.xml

@@ -86,6 +86,11 @@
 	Var MachineStage = "-"
 
 	Var PayReference = ""
+
+	If web_app_prepar = "true" Then
+		Var web_app_prepar = "false"
+		__CMD "ui-load-playlist" 0 SelectDrink "-"
+	EndIf
 	
 				
 	

xml_main/startup.xml

@@ -95,8 +95,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "5.78"
+	Var XMLPageVersion = "5.79"
-	Var XMLPageVersionInt = 578
+	Var XMLPageVersionInt = 579
 </EventOpen>
 
 <Text>