Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

xml/menu_catalog_default_init.xml

@@ -50,7 +50,9 @@
 
         Var MenuVSelected2 = "Invisible"
         If SpiralOnline = "true" Then 
-            Var MenuVSelected2 = "Enable"
+            If Seeker =  "curr" Then
+                Var MenuVSelected2 = "Enable"
+            EndIf
         EndIf 
         
         ; init default
@@ -89,4 +91,4 @@
 
 
         ;Var Menu22Selected = "Enable"
-        Var Menu22Selected = "Inivisible"
+        Var Menu22Selected = "Invisible"

xml/menu_catalog_new.xml

@@ -125,8 +125,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     If SpiralOnline = "true" Then
-        Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
-    
+        If Seeker =  "curr" Then
+            Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
+        Else
+            Open "ROOT/taobin_project/xml/page_catalog.xml" 
+        EndIf 
     Else
 	   Open "ROOT/taobin_project/xml/page_catalog.xml" 
 	EndIf

xml/page_catalog.xml

@@ -427,7 +427,7 @@
 <Button>
 <X> 564 </X>
 <Y> 1532 </Y>
-<State>"Enable"</State>
+<State>"Press"</State>
 <Filename> Var(DirImage + "/bn_HealthyOption.png") </Filename>
 <FilenamePress> Var(DirImage + "/bp_HealthyOption.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>

xml/page_catalog_group_cocktail.xml

@@ -60,9 +60,9 @@
 
         Var MenuVSelected2 = "Invisible"
         If SpiralOnline = "true" Then 
-            If Seeker = "curr" Then
-            	Var MenuVSelected2 = "Enable"
-			EndIf
+            If Seeker =  "curr" Then
+                Var MenuVSelected2 = "Enable"
+            EndIf
         EndIf 
         
         ; init default
@@ -101,7 +101,7 @@
 
 
         ;Var Menu22Selected = "Enable"
-        Var Menu22Selected = "Inivisible"
+        Var Menu22Selected = "Invisible"
 
     
         ; protein
@@ -258,11 +258,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     If SpiralOnline = "true" Then
-       If Seeker = "curr" Then
-        	Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
-		Else
-			Open "ROOT/taobin_project/xml/page_catalog.xml" 
-		EndIf
+        Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
     
     Else
 	   Open "ROOT/taobin_project/xml/page_catalog.xml" 
@@ -775,12 +771,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     If SpiralOnline = "true" Then
-        If Seeker = "curr" Then
-        	Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
-		Else
-			Open "ROOT/taobin_project/xml/page_catalog.xml" 
-		EndIf
-    
+        If Seeker =  "curr" Then
+            Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
+        Else
+            Open "ROOT/taobin_project/xml/page_catalog.xml" 
+        EndIf 
     Else
 	   Open "ROOT/taobin_project/xml/page_catalog.xml" 
 	EndIf