Release adv 16

xml/page_board.xml

@@ -267,6 +267,7 @@
 
 	EndIf
 
+	
 	SPLIT   AdvertiseProfile    "/"   1   AdvertiseProfile1
 	SPLIT   AdvertiseProfile    "/"   2   AdvertiseProfile2
 	SPLIT   AdvertiseProfile    "/"   3   AdvertiseProfile3
@@ -462,20 +463,9 @@
 
 	DEBUGVAR XMLPageVersionInt
 
-
-	If XMLPageVersionInt > 640 Then
-		Var new_layout = "true"
-	Else
-		Var new_layout = "false"
-	EndIf
-
-	DEBUGVAR new_layout
-
-	If new_layout = "true" Then
-		Machine MenuLayoutNew
-	Else
-		Machine MenuLayoutOld
-	EndIf
+	; forever
+	Var new_layout = "true"
+	Machine MenuLayoutNew
 
 	DEBUGVAR SpiralOnline
 	
@@ -510,9 +500,15 @@
 	Var NETCORE_EVENT_CNT_X = 0 
 	Var NETCORE_EVENT_CNT_TMP = NCIC07_EVENT_CNT
 
+	DEBUGVAR CameraCount
+	If CameraCount = 0 Then
+		CameraService "Start"
+	EndIf
+	
+	If CameraCount = "" Then
+		CameraService "Start"
+	EndIf
 	
-
-	;CameraService "Start"
 </EventOpen>
 
 <Timeout> 1000 </Timeout>

xml/page_camera.xml

@@ -27,7 +27,7 @@
 
 	DEBUGVAR Timeout
 	If Timeout = 5 Then
-		ShutterToFile "/mnt/sdcard/cam1.bmp"
+		;ShutterToFile "/mnt/sdcard/cam1.bmp"
 	EndIf
 	
 	Refresh
@@ -79,13 +79,13 @@
 </EventClick>
 </Button>
 
-<Camera> 
+<CameraX> 
 <X> 40 </X>
 <Y> 720 </Y>
-<Rotation>90</Rotation>
+<Name>"usbfront"</Name>
 <Width> 1280 </Width>
 <Height> 780 </Height>
-</Camera>
+</CameraX>
 
 
 

xml/page_catalog2.xml

@@ -151,9 +151,9 @@
 	Var menu_name_thai_blender = ""
 	Var menu_desc_thai_blender = ""
 
-	If CameraCount = 0 Then
+	If CameraCount = 1 Then
 		
-		CameraSetting "usb1" "default" "Rotate=270,Resolution=1280x720,scaleX=1.0,scaleY=1.0"
+		CameraSetting "usbfront" "default" "Rotate=270,Resolution=1280x720,scaleX=1.0,scaleY=1.0"
 	EndIf
 
 </EventOpen>

xml/vending_info.xml

@@ -84,7 +84,7 @@
 
 	
 	Var Text1_8 = "IP " MobileIPNetwork
-	
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -401,6 +401,9 @@
 <X> info1_startX </X>
 <Y> info_8Y </Y>
 <Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
+<EventClick> 
+	CameraService "Restart"
+</EventClick>
 </Image>
 
 
@@ -408,6 +411,9 @@
 <X> info2_startX </X>
 <Y> info_8Y </Y>
 <Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
+<EventClick> 
+	CameraService "Start"
+</EventClick>
 </Image>