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

xml/page_board.xml

@@ -24,7 +24,7 @@
 	Var web_readyOK = "false"
 
 	Var GetFreeFromError = 0
-	Var taobin_version = "1.53"
+	Var taobin_version = "2.00"
 	
 	Cart "DeleteMenuID" "ALL"
 	Var MultiPayEnable = "true"
@@ -333,6 +333,18 @@
 	
 	Var showCart = "Invisible"
 
+	Var web_app_str = ""
+	READ_FILE "/mnt/sdcard/web_app_enable" web_app_str
+	STRCONTAIN "1" web_app_str WebAppEnable
+
+	DEBUGVAR WebAppEnable
+	If WebAppEnable = "true" Then
+
+		Var WebAppShow = "Enable"
+	Else
+		Var WebAppShow = "Invisible"
+	EndIf
+
 	
 	Machine CancelWepApp
 
@@ -675,6 +687,7 @@
 <Y> 1110 </Y>
 <Width> 178 </Width>
 <Color> "0xeae6e1" </Color>
+<QRColor> "0x000000" </Color>
 <Height> 178 </Height>
 <State> WebAppShow </State>
 <Service> testservice </Service>

xml_main/startup.xml

@@ -95,8 +95,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "5.80"
+	Var XMLPageVersion = "5.81"
-	Var XMLPageVersionInt = 580
+	Var XMLPageVersionInt = 581
 </EventOpen>
 
 <Text>