merge masterpice

xml_main/startup.xml

@@ -109,11 +109,9 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "9.45"
-	Var XMLPageVersionInt = 945
-;Oreo
-Var OreoGuarantee = 0
-
+	Var XMLPageVersion = "9.86"
+	Var XMLPageVersionInt = 986
+	
 	Var CurrentMainVideo = 2
 </EventOpen>
 

xml_main/startup_dev.xml

@@ -7,8 +7,21 @@
 <Height> 600 </Height>
 <Background> "/ROOT/pictures/startup.bmp" </Background>
 <Timeout> 3000 </Timeout>
-<EventTimeout> 
-	Open "/ROOT/xml/main.xml" 
+<EventTimeout>
+
+	CameraService "filter-remove-all"
+	CameraService "add-filter=mClass=9,mSubclass=4"
+	CameraService "add-filter=USB Camera"
+
+	CameraService "Start"
+
+	Var NeedReboot = "false"
+
+	If JXMLVersionInt > 409 Then
+		FlushTxRef1
+	EndIf
+
+	Open "/ROOT/xml/main.xml"
 </EventTimeout>
 <EventOpen>
 	Var video_main_0 = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_00.mp4"
@@ -53,14 +66,14 @@
 	Var AdvertiseProfile16 = "00"
 	Var AdvertiseProfile17 = "00"
 	Var AdvertiseProfile18 = "00"
-	
+
 	Var ExtSlot1 = ""
 	Var ExtSlot2 = ""
 	Var ExtSlot3 = ""
 	Var ExtSlot4 = ""
 	Var ExtSlot5 = ""
 	Var ExtSlot6 = ""
-	
+
 	Var AdvExt1 = ".mp4"
 	Var AdvExt2 = ".mp4"
 	Var AdvExt3 = ".mp4"
@@ -82,7 +95,7 @@
 	Var AdvExt19 = ".mp4"
 	Var AdvExt20 = ".bmp"
 
-;Dtac		
+;Dtac
 	Var RandomPromotion = 0
 ;true_move
 	Var RandomPromotion1 = 0
@@ -95,8 +108,12 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "6.51"
-	Var XMLPageVersionInt = 651
+	Var XMLPageVersion = "10.86"
+	Var XMLPageVersionInt = 1086
+;Oreo
+Var OreoGuarantee = 0
+
+	Var CurrentMainVideo = 2
 </EventOpen>
 
 <Text>
@@ -136,7 +153,7 @@
 	<Font> fontType1 </Font>
 	<Color> 0xEA068A </Color>
 	<Transparent> 0 </Transparent>
-	<Value> XMLPageVersion </Value>
+<Value> XMLPageVersion </Value>
 </Text>
 
 <TextRunner>