fix #44 and update beta version

8 files changed, 83 insertions, 35 deletions

diff --git a/client/Piztor/res/drawable/footbar_btn_focus_style.xml b/client/Piztor/res/drawable/footbar_btn_focus_style.xml
index 5932f2f..ec25aa3 100644
--- a/client/Piztor/res/drawable/footbar_btn_focus_style.xml
+++ b/client/Piztor/res/drawable/footbar_btn_focus_style.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <item android:state_pressed="true" android:drawable="@drawable/footbar_marker_1"></item>
-	<item android:state_pressed="false" android:drawable="@drawable/footbar_marker"></item>   
+    <item android:state_pressed="true" android:drawable="@drawable/footbar_focus_1"></item>
+	<item android:state_pressed="false" android:drawable="@drawable/footbar_focus"></item>   
 </selector>
diff --git a/client/Piztor/res/drawable/footbar_fetch.png b/client/Piztor/res/drawable/footbar_fetch.png
index 71d1a20..b21b50f 100644
--- a/client/Piztor/res/drawable/footbar_fetch.png
+++ b/client/Piztor/res/drawable/footbar_fetch.png
diff --git a/client/Piztor/res/drawable/footbar_focus.png b/client/Piztor/res/drawable/footbar_focus.png
new file mode 100644
index 0000000..8d59e71
--- /dev/null
+++ b/client/Piztor/res/drawable/footbar_focus.png
diff --git a/client/Piztor/res/drawable/footbar_focus_1.png b/client/Piztor/res/drawable/footbar_focus_1.png
new file mode 100644
index 0000000..ff7b368
--- /dev/null
+++ b/client/Piztor/res/drawable/footbar_focus_1.png
diff --git a/client/Piztor/res/layout/activity_login.xml b/client/Piztor/res/layout/activity_login.xml
index cb27495..dac2d35 100644
--- a/client/Piztor/res/layout/activity_login.xml
+++ b/client/Piztor/res/layout/activity_login.xml
@@ -18,7 +18,7 @@
     android:layout_marginTop="16dip">
     
     <ImageView
-        android:id="@+id/main_headbar_img"
+        android:id="@+id/login_img"
         android:layout_width="180dp"
         android:layout_height="200dp"
         android:layout_gravity="center_horizontal"
@@ -31,6 +31,7 @@
         android:text="@string/app_name"
         android:textSize="30dip"
         android:textColor="#FFFFFF"/>
+
     </LinearLayout>
 
     <LinearLayout 
diff --git a/client/Piztor/res/layout/activity_settings.xml b/client/Piztor/res/layout/activity_settings.xml
index ba67683..18d037a 100644
--- a/client/Piztor/res/layout/activity_settings.xml
+++ b/client/Piztor/res/layout/activity_settings.xml
@@ -122,34 +122,76 @@
 	        android:layout_height="wrap_content"
 	        android:layout_gravity="center"
 	        android:gravity="center">
-		<TextView
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:textSize="20dip"
-		    android:text="@string/colormode"
-		    android:textColor="#FFFFFF"/>
-		<RadioGroup
-	        android:id="@+id/radioGroup" 
-	        android:contentDescription="@string/colormode" 
-	        android:layout_width="wrap_content" 
+			<TextView
+		    	android:layout_width="wrap_content"
+		    	android:layout_height="wrap_content"
+		    	android:textSize="20dip"
+		    	android:text="@string/colormode"
+		   	 	android:textColor="#FFFFFF"/>
+			<RadioGroup
+	        	android:id="@+id/colorRadioGroup" 
+	        	android:contentDescription="@string/colormode" 
+	        	android:layout_width="wrap_content" 
+	        	android:layout_height="wrap_content"
+	        	android:layout_marginLeft="10dip"
+	       	 	android:orientation="horizontal">
+ 				<RadioButton 
+ 			    	android:layout_width="wrap_content" 
+ 			    	android:layout_height="wrap_content" 
+ 			    	android:id="@+id/show_by_team"
+ 			    	android:textSize="18dip" 
+ 			    	android:text="@string/show_team" 
+ 			    	android:checked="true"/>
+				<RadioButton 
+			    	android:layout_width="wrap_content" 
+			    	android:layout_height="wrap_content" 
+			    	android:layout_marginLeft="10dip"
+			    	android:id="@+id/show_by_sex" 
+			    	android:textSize="18dip"
+			    	android:text="@string/show_sex"/>    
+			</RadioGroup>
+	    </LinearLayout>
+	    <View
+	        android:layout_width="fill_parent"
+	        android:layout_height="1.0px"
+	        android:layout_marginTop="20dip"
+	        android:layout_marginBottom="20dip"
+	        android:layout_marginLeft="20dip"
+	        android:layout_marginRight="20dip"
+	        android:background="#ffc0c3c4" />
+	    <LinearLayout
+	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
-	        android:layout_marginLeft="10dip"
-	        android:orientation="horizontal">
- 			<RadioButton 
- 			    android:layout_width="wrap_content" 
- 			    android:layout_height="wrap_content" 
- 			    android:id="@+id/show_by_team"
- 			    android:textSize="18dip" 
- 			    android:text="@string/show_team" 
- 			    android:checked="true"/>
-			<RadioButton 
-			    android:layout_width="wrap_content" 
-			    android:layout_height="wrap_content" 
-			    android:layout_marginLeft="10dip"
-			    android:id="@+id/show_by_sex" 
-			    android:textSize="18dip"
-			    android:text="@string/show_sex"/>    
-		</RadioGroup>
+	        android:layout_gravity="center"
+	        android:gravity="center">
+			<TextView
+		    	android:layout_width="wrap_content"
+		    	android:layout_height="wrap_content"
+		    	android:textSize="20dip"
+		    	android:text="@string/locatemode"
+		   	 	android:textColor="#FFFFFF"/>
+			<RadioGroup
+	        	android:id="@+id/locateRadioGroup" 
+	        	android:contentDescription="@string/locatemode" 
+	        	android:layout_width="wrap_content" 
+	        	android:layout_height="wrap_content"
+	        	android:layout_marginLeft="10dip"
+	       	 	android:orientation="horizontal">
+ 				<RadioButton 
+ 			    	android:layout_width="wrap_content" 
+ 			    	android:layout_height="wrap_content" 
+ 			    	android:id="@+id/gps_first"
+ 			    	android:textSize="18dip" 
+ 			    	android:text="@string/gps_first" 
+ 			    	android:checked="true"/>
+				<RadioButton 
+			    	android:layout_width="wrap_content" 
+			    	android:layout_height="wrap_content" 
+			    	android:layout_marginLeft="10dip"
+			    	android:id="@+id/network_first" 
+			    	android:textSize="18dip"
+			    	android:text="@string/network_first"/>    
+			</RadioGroup>
 	    </LinearLayout>
 	    <View
 	        android:layout_width="fill_parent"
diff --git a/client/Piztor/res/layout/subscribe_settings.xml b/client/Piztor/res/layout/subscribe_settings.xml
index a90837c..92b905b 100644
--- a/client/Piztor/res/layout/subscribe_settings.xml
+++ b/client/Piztor/res/layout/subscribe_settings.xml
@@ -3,15 +3,17 @@
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    >
+    android:layout_marginTop="10dip">
     <TextView 
         android:layout_width="wrap_content" 
         android:layout_height="wrap_content" 
         android:id="@+id/textView1" 
         android:text="TextView" 
+        android:textSize="20dip"
         android:layout_alignParentBottom="true" 
         android:layout_centerHorizontal="true" 
-        android:layout_marginBottom="10dp"/>
+        android:layout_marginBottom="10dip"
+        android:layout_marginLeft="10dip"/>
 	<RelativeLayout
 	    android:layout_width="fill_parent"
 	    android:layout_height="wrap_content"
diff --git a/client/Piztor/res/values/strings.xml b/client/Piztor/res/values/strings.xml
index 25e980a..8fe47a3 100644
--- a/client/Piztor/res/values/strings.xml
+++ b/client/Piztor/res/values/strings.xml
@@ -6,9 +6,9 @@
     <string name="hello_world">Hello world!</string>
     <string name="settings">设置</string>
     <string name="search">搜索</string>
-    <string name="fetch">上传</string>
+    <string name="fetch">更新</string>
     <string name="checkin">签到</string>
-    <string name="focus">聚焦</string>
+    <string name="focus">定位</string>
     <string name="show_sex">按性别</string>
     <string name="male">Male</string>
     <string name="female">Female</string>
@@ -34,11 +34,14 @@
     <string name="company">连队</string>
     <string name="section">班级</string>
     <string name="add">添加</string>
-    <string name="GPSrefreshrate">GPS刷新率 每</string>
+    <string name="GPSrefreshrate">定位刷新率 每</string>
     <string name="old_password">旧密码</string>
     <string name="new_password">新密码</string>
     <string name="submit">提交</string>
     <string name="colormode">着色方式</string>
     <string name="save">保存</string>
+    <string name="locatemode">定位方式</string>
+    <string name="gps_first">GPS优先</string>
+    <string name="network_first">网络优先</string>
 
 </resources>